Avoid an OpenGL dependency in C4Surface.h

objectmenu
Günther Brammer 2016-01-17 23:05:44 +01:00
parent d31792f1d7
commit d09ed41eea
2 changed files with 9 additions and 11 deletions

View File

@ -22,6 +22,12 @@
#include "StdMeshMath.h"
#include "C4Surface.h"
#ifdef _WIN32
#include <C4windowswrapper.h>
#endif
#include <GL/glew.h>
// Shader version
const int C4Shader_Version = 150; // GLSL 1.50 / OpenGL 3.2

View File

@ -21,14 +21,6 @@
#include <StdColors.h>
#include <C4Rect.h>
#ifdef _WIN32
#include <C4windowswrapper.h>
#endif
#ifndef USE_CONSOLE
#include <GL/glew.h>
#endif
#include <list>
// blitting modes
@ -83,8 +75,8 @@ public:
int *dbg_idx;
#endif
#ifndef USE_CONSOLE
GLenum Format; // used color format in textures
CStdGLCtx * pCtx;
unsigned int Format; // used color format in textures
CStdGLCtx * pCtx;
#endif
std::vector<C4TexRef> textures; // textures
BYTE byBytesPP; // bytes per pixel (2 or 4)
@ -184,7 +176,7 @@ class C4TexRef
public:
LOCKED_RECT texLock; // current lock-data
#ifndef USE_CONSOLE
GLuint texName;
unsigned int texName;
#endif
int iSizeX;
int iSizeY;