mesa: add a UniformBooleanTrue option

Drivers supporting native integers set UniformBooleanTrue to the integer value
that should be used for true when uploading uniform booleans.  This is ~0 for
Gallium and 1 for i965.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 6ef0fcb313c4b43371b215b6aef8a3ac5a88f0b4..5ea7385f94b48afb6c7adf66bc2ed6095eb1975c 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -253,8 +253,10 @@ GLboolean brwCreateContext( int api,
    /* If we're using the new shader backend, we require integer uniforms
     * stored as actual integers.
     */
-   if (brw->new_vs_backend)
+   if (brw->new_vs_backend) {
       ctx->Const.NativeIntegers = true;
+      ctx->Const.UniformBooleanTrue = 1;
+   }
 
    return GL_TRUE;
 }

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 44ebf0a5351a8c51206c2d51814458a211f2e949..ad5979796d62dc7754c40061f99e3ca86d2c968f 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2722,6 +2722,12 @@ struct gl_constants
     */
    GLboolean NativeIntegers;
 
+   /**
+    * If the driver supports real 32-bit integers, what integer value should be
+    * used for boolean true in uniform uploads?  (Usually 1 or ~0.)
+    */
+   GLuint UniformBooleanTrue;
+
    /** Which texture units support GL_ATI_envmap_bumpmap as targets */
    GLbitfield SupportedBumpUnits;
 

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index fe1ce6d7b2c8457990e40cf845d1deb9034c7675..b0f9c33b8d343add204803e1c3a138fe418f1690 100644 (file)
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -802,7 +802,10 @@ set_program_uniform(struct gl_context *ctx, struct gl_program *program,
                else
                   uniformVal[i].b = uniformVal[i].u ? 1 : 0;
                
-               if (!ctx->Const.NativeIntegers)
+               if (ctx->Const.NativeIntegers)
+                  uniformVal[i].u =
+                        uniformVal[i].b ? ctx->Const.UniformBooleanTrue : 0;
+               else
                   uniformVal[i].f = uniformVal[i].b ? 1.0f : 0.0f;
             }
          }

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index aa7f3b52cb24287b6d3cc9714dd0bd5e795e922f..76e84ebe3073bce8333dc201061e510303025fc2 100644 (file)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -207,6 +207,7 @@ void st_init_limits(struct st_context *st)
       c->MaxProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXEL_OFFSET);
 
       c->GLSLVersion = 120;
+      c->UniformBooleanTrue = ~0;
    }
 }