diff options
| author | Stephane Marchesin <stephane.marchesin@gmail.com> | 2010-04-20 03:06:53 -0700 |
|---|---|---|
| committer | Stephane Marchesin <stephane.marchesin@gmail.com> | 2010-04-20 03:06:53 -0700 |
| commit | 93b009d92e6c2321e79c612e886584fd4438d64b (patch) | |
| tree | b0f24169d270873ceef95de96478cdfef6fb4edf | |
| parent | be0b16576772acc2a0acb6f5d541081fbd7a9793 (diff) | |
GL: small fixes.
| -rw-r--r-- | render-gl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/render-gl.c b/render-gl.c index f8f2abf..fd3a06c 100644 --- a/render-gl.c +++ b/render-gl.c @@ -267,7 +267,6 @@ void render_texture(int x, int y, int w, int h, u16 atlas_x, u16 atlas_y, u8 pal set_render_state(state_tile); #if GLSL - // FIXME to int pglUniform2fARB( pglGetUniformLocationARB(tile_glsl_program, "local0"), pal_offset/255.0, alpha/255.0 ); #else glColor4ub(pal_offset, 0, 0, alpha); @@ -732,11 +731,11 @@ void render_init(u32 pixel_size) pglUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)SDL_GL_GetProcAddress("glUseProgramObjectARB"); pglUniform1iARB = (PFNGLUNIFORM1IARBPROC)SDL_GL_GetProcAddress("glUniform1i"); pglGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)SDL_GL_GetProcAddress("glGetUniformLocation"); - pglUniform2fARB = (PFNGLUNIFORM3FARBPROC)SDL_GL_GetProcAddress("glUniform2f"); + pglUniform2fARB = (PFNGLUNIFORM2FARBPROC)SDL_GL_GetProcAddress("glUniform2f"); if (!( pglGenFramebuffers && pglBindFramebuffer && pglFramebufferTexture2D && pglProgramLocalParameter4f && pglGenPrograms && pglBindProgram && pglProgramString && pglGetProgramiv && pglUseProgramObjectARB - && pglUniform1iARB && pglGetUniformLocationARB)) + && pglUniform1iARB && pglGetUniformLocationARB && pglUniform2fARB)) fatal("Sorry, your OpenGL misses some cool features\n"); glViewport(0, 0, pixel_size*320, pixel_size*240); |