Mesa (7.9): intel: Fix typeos from 3d028024 and 790ff232
Ian Romanick
idr at kemper.freedesktop.org
Mon Feb 28 22:27:52 UTC 2011
Module: Mesa
Branch: 7.9
Commit: 4d2a725196e70f5480a90d9af818a1b508ac98a9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d2a725196e70f5480a90d9af818a1b508ac98a9
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Jan 20 13:51:07 2011 -0800
intel: Fix typeos from 3d028024 and 790ff232
...and remove egg from face.
(cherry picked from commit 2fb0aebd4a248d2a0725099cd5646253c30c1dc3)
---
src/mesa/drivers/dri/i915/i915_context.c | 20 ++++++++++----------
src/mesa/drivers/dri/i965/brw_context.c | 10 +++++-----
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 7ebbccd..970cd4a 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -175,16 +175,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 789cf97..8b6d43e 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;
if (intel->is_g4x || intel->gen >= 5) {
brw->CMD_VF_STATISTICS = CMD_VF_STATISTICS_GM45;
More information about the mesa-commit
mailing list