Attachment 17470 Details for Bug 16157 – patch to fix vertex shader texture sample crash

[patch] patch to fix vertex shader texture sample crash

vertex-texture.patch (text/plain), 1.35 KB, created by Brian Paul on 2008-07-01 07:53:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2008-07-01 07:53:53 UTC

Size: 1.35 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
>index 33f1bba..1c7ad5c 100644
>--- a/src/mesa/drivers/dri/i965/brw_context.c
>+++ b/src/mesa/drivers/dri/i965/brw_context.c
>@@ -125,7 +125,7 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
>    ctx->Const.MaxTextureUnits = BRW_MAX_TEX_UNIT;
>    ctx->Const.MaxTextureImageUnits = BRW_MAX_TEX_UNIT;
>    ctx->Const.MaxTextureCoordUnits = BRW_MAX_TEX_UNIT;
>-
>+   ctx->Const.MaxVertexTextureImageUnits = 0; /* no vertex shader textures */
> 
>    /* Advertise the full hardware capabilities.  The new memory
>     * manager should cope much better with overload situations:
>diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
>index dd4990b..f9a5ece 100644
>--- a/src/mesa/shader/slang/slang_link.c
>+++ b/src/mesa/shader/slang/slang_link.c
>@@ -474,6 +474,12 @@ _slang_link(GLcontext *ctx,
>       }         
>    }
> 
>+   /* Check that the vertex program doesn't use too many sampler units */
>+   if (shProg->VertexProgram &&
>+       _mesa_bitcount(shProg->VertexProgram->Base.SamplersUsed) > ctx->Const.MaxVertexTextureImageUnits) {
>+      link_error(shProg, "Vertex program uses too many samplers.\n");
>+      return;
>+   }
> 
>    if (fragProg && shProg->FragmentProgram) {
>       /* notify driver that a new fragment program has been compiled/linked */

Actions: View | Splinter Review

Attachments on bug 16157: 16818 | 16819 | 17470

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.