16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00

texture-related render code bumped to openGL 1.4; disabled texture switching optimization until other parts of the render code are reviewed.

This commit is contained in:
tmj-fstate
2017-02-13 22:06:26 +01:00
parent 6ed00729fc
commit a362d10fb0
3 changed files with 105 additions and 326 deletions

View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
#include <string>
#include "opengl/glew.h"
enum resource_state {
enum class resource_state {
none,
loading,
good,
@@ -41,7 +41,7 @@ private:
// members
std::vector<char> data; // texture data
resource_state data_state{ none }; // current state of texture data
resource_state data_state{ resource_state::none }; // current state of texture data
int data_width{ 0 },
data_height{ 0 },
data_mapcount{ 0 };