pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed wrong datatype for shaders and programs.

Browse source 
This is a pointer on Mac OS X, so it risked losing data in 64-bit builds.
This commit is contained in:
Ryan C. Gordon 2011-08-23 06:27:04 -04:00
parent 315893bf28
commit 84d42b9a9f
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/render/opengl/SDL_shaders_gl.c
View file

@ -34,9 +34,9 @@
typedef struct typedef struct
{ {
GLenum program; GLhandleARB program;
GLenum vert_shader; GLhandleARB vert_shader;
GLenum frag_shader; GLhandleARB frag_shader;
} GL_ShaderData; } GL_ShaderData;
struct GL_ShaderContext struct GL_ShaderContext
@ -167,7 +167,7 @@ static const char *shader_source[NUM_SHADERS][2] =
}; };
static SDL_bool static SDL_bool
CompileShader(GL_ShaderContext *ctx, GLenum shader, const char *defines, const char *source) CompileShader(GL_ShaderContext *ctx, GLhandleARB shader, const char *defines, const char *source)
{ {
GLint status; GLint status;
const char *sources[2]; const char *sources[2];

8
test/testshader.c
View file

@ -29,9 +29,9 @@ enum {
}; };
typedef struct { typedef struct {
GLuint program; GLhandleARB program;
GLuint vert_shader; GLhandleARB vert_shader;
GLuint frag_shader; GLhandleARB frag_shader;
const char *vert_source; const char *vert_source;
const char *frag_source; const char *frag_source;
} ShaderData; } ShaderData;
@ -124,7 +124,7 @@ static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
static PFNGLUNIFORM1IARBPROC glUniform1iARB; static PFNGLUNIFORM1IARBPROC glUniform1iARB;
static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB; static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
static SDL_bool CompileShader(GLenum shader, const char *source) static SDL_bool CompileShader(GLhandleARB shader, const char *source)
{ {
GLint status; GLint status;