From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 18 Sep 2009 03:15:27 +0000 (+0800)
Subject: es: Turn of FEATURE_es2_glsl.
X-Git-Tag: android-x86-1.6~21
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-mesa.git;a=commitdiff_plain;h=08b9155eee16770c37acd126f5c542937e378e41

es: Turn of FEATURE_es2_glsl.
---

diff --git a/src/mesa/es/main/mfeatures.h b/src/mesa/es/main/mfeatures.h
index 19f09b233fd..8318f641e3b 100644
--- a/src/mesa/es/main/mfeatures.h
+++ b/src/mesa/es/main/mfeatures.h
@@ -60,7 +60,7 @@
 #define FEATURE_dlist 0
 #define FEATURE_draw_read_buffer 0
 #define FEATURE_drawpix 0
-#define FEATURE_es2_glsl 1
+#define FEATURE_es2_glsl 0
 #define FEATURE_evaluators 0
 #define FEATURE_feedback 0
 #define FEATURE_fixedpt 1
diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c
index 02c3247e948..1de2cdd3cdf 100644
--- a/src/mesa/es/main/specials_es1.c
+++ b/src/mesa/es/main/specials_es1.c
@@ -180,7 +180,5 @@ _es_GetString(GLenum name)
 void
 _mesa_initialize_context_extra(GLcontext *ctx)
 {
-   /* FEATURE_es2_glsl is on */
-   ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
-   ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
+   /* nothing special */
 }