aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/swrast
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-31 09:31:38 +0100
committermarha <marha@users.sourceforge.net>2012-10-31 09:31:38 +0100
commit5b22d4d5511efbd4fb0658c370edadd39829e39b (patch)
tree96a36b429ff2a0819653279a5e63a1bed79d4434 /mesalib/src/mesa/drivers/dri/swrast
parent7bc456b7052b9591a58bfb6b509abb09d5464990 (diff)
parent67c290de36ddc1caae94c0892157ac16b90e4f99 (diff)
downloadvcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.gz
vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.bz2
vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa git update 31 oct 2012
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast')
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/swrast.c4
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 ffeda5161..f6c6133e3 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -653,12 +653,8 @@ swrast_init_driver_functions(struct dd_function_table *driver)
static const char *es2_extensions[] = {
/* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
- "GL_ARB_transpose_matrix",
- "GL_ARB_window_pos",
"GL_EXT_blend_func_separate",
- "GL_EXT_compiled_vertex_array",
"GL_EXT_framebuffer_blit",
- "GL_IBM_multimode_draw_arrays",
"GL_MESA_window_pos",
/* Required by GLES2 */