diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
| commit | 73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch) | |
| tree | c6436b57a2191c57320396c37449109ebad745ec /mesalib/src/mesa/drivers/dri/swrast | |
| parent | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff) | |
| parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
| download | vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2 vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 4ea7f0d3c..8f7509704 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -595,17 +595,13 @@ static const char *es2_extensions[] = { /* Required by GLES2 */ "GL_ARB_fragment_program", "GL_ARB_fragment_shader", - "GL_ARB_multitexture", "GL_ARB_shader_objects", "GL_ARB_texture_cube_map", - "GL_ARB_texture_mirrored_repeat", "GL_ARB_texture_non_power_of_two", "GL_ARB_vertex_shader", "GL_EXT_blend_color", "GL_EXT_blend_equation_separate", "GL_EXT_blend_minmax", - "GL_EXT_blend_subtract", - "GL_EXT_stencil_wrap", /* Optional GLES2 */ "GL_ARB_framebuffer_object", |