revision 1248:0ea1904e2b14
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 1248:0ea1904e2b14 |
parent | 1247:e48ea82eb72c |
child | 1249:a81130f57df6 |
author | nkeynes |
date | Sat Mar 03 15:56:29 2012 +1000 (12 years ago) |
Assume that shaders are available on GLES2 (true by definition)
src/pvr2/gl_sl.c | view | annotate | diff | log | ||
src/pvr2/glutil.c | view | annotate | diff | log |
1.1 --- a/src/pvr2/gl_sl.c Sat Mar 03 15:52:59 2012 +10001.2 +++ b/src/pvr2/gl_sl.c Sat Mar 03 15:56:29 2012 +10001.3 @@ -50,9 +50,9 @@1.5 gboolean glsl_is_supported()1.6 {1.7 - return isGLExtensionSupported("GL_ARB_fragment_shader") &&1.8 + return isOpenGLES2() || (isGLExtensionSupported("GL_ARB_fragment_shader") &&1.9 isGLExtensionSupported("GL_ARB_vertex_shader") &&1.10 - isGLExtensionSupported("GL_ARB_shading_language_100");1.11 + isGLExtensionSupported("GL_ARB_shading_language_100"));1.12 }1.14 const char *glsl_get_version()1.15 @@ -182,9 +182,9 @@1.17 gboolean glsl_is_supported()1.18 {1.19 - return isGLExtensionSupported("GL_ARB_fragment_shader") &&1.20 + return isOpenGLES2() || (isGLExtensionSupported("GL_ARB_fragment_shader") &&1.21 isGLExtensionSupported("GL_ARB_vertex_shader") &&1.22 - isGLExtensionSupported("GL_ARB_shading_language_100");1.23 + isGLExtensionSupported("GL_ARB_shading_language_100"));1.24 }1.26 const char *glsl_get_version()
2.1 --- a/src/pvr2/glutil.c Sat Mar 03 15:52:59 2012 +10002.2 +++ b/src/pvr2/glutil.c Sat Mar 03 15:56:29 2012 +10002.3 @@ -54,7 +54,7 @@2.4 */2.5 gboolean isGLMultitextureSupported()2.6 {2.7 - if( !isGLExtensionSupported("GL_ARB_multitexture") )2.8 + if( !isOpenGLES2() && !isGLExtensionSupported("GL_ARB_multitexture") )2.9 return FALSE;2.10 int units = 0;
.