Commit 84d42b9a authored by Ryan C. Gordon's avatar Ryan C. Gordon

Fixed wrong datatype for shaders and programs.

This is a pointer on Mac OS X, so it risked losing data in 64-bit builds.
parent 315893bf
......@@ -34,9 +34,9 @@
typedef struct
{
GLenum program;
GLenum vert_shader;
GLenum frag_shader;
GLhandleARB program;
GLhandleARB vert_shader;
GLhandleARB frag_shader;
} GL_ShaderData;
struct GL_ShaderContext
......@@ -167,7 +167,7 @@ static const char *shader_source[NUM_SHADERS][2] =
};
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;
const char *sources[2];
......
......@@ -29,9 +29,9 @@ enum {
};
typedef struct {
GLuint program;
GLuint vert_shader;
GLuint frag_shader;
GLhandleARB program;
GLhandleARB vert_shader;
GLhandleARB frag_shader;
const char *vert_source;
const char *frag_source;
} ShaderData;
......@@ -124,7 +124,7 @@ static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
static PFNGLUNIFORM1IARBPROC glUniform1iARB;
static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
static SDL_bool CompileShader(GLenum shader, const char *source)
static SDL_bool CompileShader(GLhandleARB shader, const char *source)
{
GLint status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment