From 457d7218b8e0f0c21ae31564d25b7031b423b0f8 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 11:34:46 +0900
Subject: mesa: Use appropriate unsigned/signed, float/integer types.

---
 src/mesa/shader/program.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/shader/program.c')

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 2932c9ebc5..55f862a392 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -513,7 +513,7 @@ _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
       if (inst->BranchTarget > 0) {
-         if (inst->BranchTarget >= start) {
+         if ((GLuint)inst->BranchTarget >= start) {
             inst->BranchTarget += count;
          }
       }
-- 
cgit v1.2.3


From 93c90d34d10e06105984796b7b157f2a3e6db5c1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 12 Aug 2008 10:00:36 -0600
Subject: mesa: set point state (cherry picked from commit
 af3d9dba562813ffed71691bffd7faf6665c4487)

---
 src/mesa/main/points.c    | 4 ++++
 src/mesa/shader/program.c | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/mesa/shader/program.c')

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index 7e189a0a8c..e450b15139 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -254,7 +254,11 @@ _mesa_init_point(GLcontext *ctx)
    ctx->Point.MaxSize
       = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA);
    ctx->Point.Threshold = 1.0;
+#if FEATURE_es2_glsl
+   ctx->Point.PointSprite = GL_TRUE; /* GL_ARB/NV_point_sprite */
+#else
    ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */
+#endif
    ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
    ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 55f862a392..b3618641e5 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -58,7 +58,11 @@ _mesa_init_program(GLcontext *ctx)
 
 #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
    ctx->VertexProgram.Enabled = GL_FALSE;
+#if FEATURE_es2_glsl
+   ctx->VertexProgram.PointSizeEnabled = GL_TRUE;
+#else
    ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
+#endif
    ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
    _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
                             ctx->Shared->DefaultVertexProgram);
-- 
cgit v1.2.3