File MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff of Package Mesa

Overview Repositories Revisions Requests Users Attributes Meta

File MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff of Package Mesa

commit c281d3d5caedf75eaa3c877f94656f982aad868d
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date:   Tue Oct 7 17:27:33 2008 +0800

i965: Fix a potential assertion failure.
    (cherry picked from commit d01f9fa778cb0d230c697badaea078f6f37da743)

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index f148b10..89b7c2a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -365,8 +365,10 @@ static void brw_prepare_vertices(struct brw_context *brw)
 	 if (i == 0) {
 	    /* Position array not properly enabled:
 	     */
-	    if (input->glarray->StrideB == 0)
-	      return;
+            if (input->glarray->StrideB == 0) {
+               intel->Fallback = 1;
+               return;
+            }
 
 	    interleave = input->glarray->StrideB;
 	    ptr = input->glarray->Ptr;
commit 46921a5ee832a3443894dcc98e065d2f535e899d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Fri Oct 10 11:47:43 2008 -0700

intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 driver
    (cherry picked from commit e7002694418cd0decb1cd0d9121f634480e5f0d6)

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index f394b98..4c04d08 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -258,7 +258,11 @@ static const struct dri_extension brw_extensions[] = {
    { "GL_ARB_point_sprite", 		  NULL },
    { "GL_ARB_shader_objects",             GL_ARB_shader_objects_functions },
    { "GL_ARB_shading_language_100",       GL_VERSION_2_0_functions },
+#if 0
+   /* Support for GLSL 1.20 is currently broken in core Mesa.
+    */
    { "GL_ARB_shading_language_120",       GL_VERSION_2_1_functions },
+#endif
    { "GL_ARB_shadow",                     NULL },
    { "GL_ARB_texture_non_power_of_two",   NULL },
    { "GL_ARB_vertex_shader",              GL_ARB_vertex_shader_functions },

Places

File MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff of Package Mesa

Places