diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-05 11:23:51 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-05 11:23:51 +0000 |
commit | 6f748d9621cc51c676253dcb55c5c1ef753ff28a (patch) | |
tree | 71ec2fdf160dae0770f26021f5b7910bf93baef0 /libvo/gl_common.c | |
parent | ad733dd01d9560ea5103bc1178a205fdbe6da393 (diff) | |
download | mpv-6f748d9621cc51c676253dcb55c5c1ef753ff28a.tar.bz2 mpv-6f748d9621cc51c676253dcb55c5c1ef753ff28a.tar.xz |
more GL extension checks to avoid crashes with Mesa
(those crashes are against OpenGL spec though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18578 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r-- | libvo/gl_common.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index e6126c0590..08e74a7412 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -259,24 +259,24 @@ static const extfunc_desc_t extfuncs[] = { {(void **)&MapBuffer, NULL, {"glMapBuffer", "glMapBufferARB", NULL}}, {(void **)&UnmapBuffer, NULL, {"glUnmapBuffer", "glUnmapBufferARB", NULL}}, {(void **)&BufferData, NULL, {"glBufferData", "glBufferDataARB", NULL}}, - {(void **)&CombinerParameterfv, NULL, {"glCombinerParameterfv", "glCombinerParameterfvNV", NULL}}, - {(void **)&CombinerParameteri, NULL, {"glCombinerParameteri", "glCombinerParameteriNV", NULL}}, - {(void **)&CombinerInput, NULL, {"glCombinerInput", "glCombinerInputNV", NULL}}, - {(void **)&CombinerOutput, NULL, {"glCombinerOutput", "glCombinerOutputNV", NULL}}, - {(void **)&BeginFragmentShader, NULL, {"glBeginFragmentShaderATI", NULL}}, - {(void **)&EndFragmentShader, NULL, {"glEndFragmentShaderATI", NULL}}, - {(void **)&SampleMap, NULL, {"glSampleMapATI", NULL}}, - {(void **)&ColorFragmentOp2, NULL, {"glColorFragmentOp2ATI", NULL}}, - {(void **)&ColorFragmentOp3, NULL, {"glColorFragmentOp3ATI", NULL}}, - {(void **)&SetFragmentShaderConstant, NULL, {"glSetFragmentShaderConstantATI", NULL}}, + {(void **)&CombinerParameterfv, "NV_register_combiners", {"glCombinerParameterfv", "glCombinerParameterfvNV", NULL}}, + {(void **)&CombinerParameteri, "NV_register_combiners", {"glCombinerParameteri", "glCombinerParameteriNV", NULL}}, + {(void **)&CombinerInput, "NV_register_combiners", {"glCombinerInput", "glCombinerInputNV", NULL}}, + {(void **)&CombinerOutput, "NV_register_combiners", {"glCombinerOutput", "glCombinerOutputNV", NULL}}, + {(void **)&BeginFragmentShader, "ATI_fragment_shader", {"glBeginFragmentShaderATI", NULL}}, + {(void **)&EndFragmentShader, "ATI_fragment_shader", {"glEndFragmentShaderATI", NULL}}, + {(void **)&SampleMap, "ATI_fragment_shader", {"glSampleMapATI", NULL}}, + {(void **)&ColorFragmentOp2, "ATI_fragment_shader", {"glColorFragmentOp2ATI", NULL}}, + {(void **)&ColorFragmentOp3, "ATI_fragment_shader", {"glColorFragmentOp3ATI", NULL}}, + {(void **)&SetFragmentShaderConstant, "ATI_fragment_shader", {"glSetFragmentShaderConstantATI", NULL}}, {(void **)&ActiveTexture, NULL, {"glActiveTexture", "glActiveTextureARB", NULL}}, {(void **)&BindTexture, NULL, {"glBindTexture", "glBindTextureARB", "glBindTextureEXT", NULL}}, {(void **)&MultiTexCoord2f, NULL, {"glMultiTexCoord2f", "glMultiTexCoord2fARB", NULL}}, - {(void **)&GenPrograms, NULL, {"glGenPrograms", "glGenProgramsARB", "glGenProgramsNV", NULL}}, - {(void **)&DeletePrograms, NULL, {"glDeletePrograms", "glDeleteProgramsARB", "glDeleteProgramsNV", NULL}}, - {(void **)&BindProgram, NULL, {"glBindProgram", "glBindProgramARB", "glBindProgramNV", NULL}}, - {(void **)&ProgramString, NULL, {"glProgramString", "glProgramStringARB", "glProgramStringNV", NULL}}, - {(void **)&ProgramEnvParameter4f, NULL, {"glProgramEnvParameter4f", "glProgramEnvParameter4fARB", "glProgramEnvParameter4fNV", NULL}}, + {(void **)&GenPrograms, "_program", {"glGenPrograms", "glGenProgramsARB", "glGenProgramsNV", NULL}}, + {(void **)&DeletePrograms, "_program", {"glDeletePrograms", "glDeleteProgramsARB", "glDeleteProgramsNV", NULL}}, + {(void **)&BindProgram, "_program", {"glBindProgram", "glBindProgramARB", "glBindProgramNV", NULL}}, + {(void **)&ProgramString, "_program", {"glProgramString", "glProgramStringARB", "glProgramStringNV", NULL}}, + {(void **)&ProgramEnvParameter4f, "_program", {"glProgramEnvParameter4f", "glProgramEnvParameter4fARB", "glProgramEnvParameter4fNV", NULL}}, {(void **)&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalEXT", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}}, {NULL} }; |