summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-01-20 13:51:07 -0800
committerIan Romanick <ian.d.romanick@intel.com>2011-02-28 13:55:36 -0800
commitf9e01af6c3071669c2d52ddaeea98c98b8b7e10c (patch)
treea5c63d8476694b8d4dc334a511cf25bc06ed776a
parent0a92301c8086752542b4a961762e0964bc75aee9 (diff)
intel: Fix typeos from 3d028024 and 790ff232
...and remove egg from face. (cherry picked from commit 2fb0aebd4a248d2a0725099cd5646253c30c1dc3)
-rw-r--r--src/mesa/drivers/dri/i915/i915_context.c20
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c10
2 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 49ad7db2893..474252b640d 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -171,16 +171,16 @@ i915CreateContext(int api,
/* i915 stores all values in single-precision floats. Values aren't set
* for other program targets because software is used for those targets.
*/
- ctx->FragmentProgram.MediumFloat.RangeMin = 127;
- ctx->FragmentProgram.MediumFloat.RangeMax = 127;
- ctx->FragmentProgram.MediumFloat.Precision = 23;
- ctx->FragmentProgram.LowFloat = ctx->FragmentProgram.HighFloat =
- ctx->FragmentProgram.MediumFloat;
- ctx->FragmentProgram.MediumInt.RangeMin = 24;
- ctx->FragmentProgram.MediumInt.RangeMax = 24;
- ctx->FragmentProgram.MediumInt.Precision = 0;
- ctx->FragmentProgram.LowInt = ctx->FragmentProgram.HighInt =
- ctx->FragmentProgram.MediumInt;
+ ctx->Const.FragmentProgram.MediumFloat.RangeMin = 127;
+ ctx->Const.FragmentProgram.MediumFloat.RangeMax = 127;
+ ctx->Const.FragmentProgram.MediumFloat.Precision = 23;
+ ctx->Const.FragmentProgram.LowFloat = ctx->Const.FragmentProgram.HighFloat =
+ ctx->Const.FragmentProgram.MediumFloat;
+ ctx->Const.FragmentProgram.MediumInt.RangeMin = 24;
+ ctx->Const.FragmentProgram.MediumInt.RangeMax = 24;
+ ctx->Const.FragmentProgram.MediumInt.Precision = 0;
+ ctx->Const.FragmentProgram.LowInt = ctx->Const.FragmentProgram.HighInt =
+ ctx->Const.FragmentProgram.MediumInt;
ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index d3b61abe896..9483ec69d96 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -154,11 +154,11 @@ GLboolean brwCreateContext( int api,
/* Fragment shaders use real, 32-bit twos-complement integers for all
* integer types.
*/
- ctx->FragmentProgram.LowInt.RangeMin = 31;
- ctx->FragmentProgram.LowInt.RangeMax = 30;
- ctx->FragmentProgram.LowInt.Precision = 0;
- ctx->FragmentProgram.HighInt = ctx->FragmentProgram.MediumInt
- = ctx->FragmentProgram.LowInt;
+ ctx->Const.FragmentProgram.LowInt.RangeMin = 31;
+ ctx->Const.FragmentProgram.LowInt.RangeMax = 30;
+ ctx->Const.FragmentProgram.LowInt.Precision = 0;
+ ctx->Const.FragmentProgram.HighInt = ctx->Const.FragmentProgram.MediumInt
+ = ctx->Const.FragmentProgram.LowInt;
/* Gen6 converts quads to polygon in beginning of 3D pipeline,
but we're not sure how it's actually done for vertex order,