Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83679
Cc: 10.2 <mesa-sta...@lists.freedesktop.org>
Two patches which were meant for the 10.3 branch created errors in the
10.2 branch:
548fd6cd2564fe1c4e72ca6b2752fd2584afc7e2
af50ae73f01bebc312555c49e49e33cbfbaf56e3
In both cases, a parameter in 10.2 was converted to a gl_constants
parameter in 10.3.
The patches above use the newer gl_constants parameter, causing
compilation errors. Dereferencing the target constant from the
available context parameters resolves the error.
---
src/mesa/main/context.c | 2 +-
src/mesa/state_tracker/st_extensions.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index f670fec..6b95b60 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -648,7 +648,7 @@ _mesa_init_constants(struct gl_context *ctx)
ctx->Const.MaxSamples = 0;
/* GLSL default if NativeIntegers == FALSE */
- consts->UniformBooleanTrue = FLT_AS_UINT(1.0f);
+ ctx->Const.UniformBooleanTrue = FLT_AS_UINT(1.0f);
/* GL_ARB_sync */
ctx->Const.MaxServerWaitTimeout = 0x1fff7fffffffULL;
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index e153dc3..8889159 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -642,7 +642,7 @@ void st_init_extensions(struct st_context *st)
}
}
- consts->UniformBooleanTrue = consts->NativeIntegers ? ~0 : fui(1.0f);
+ ctx->Const.UniformBooleanTrue = ctx->Const.NativeIntegers ? ~0 : fui(1.0f);
/* Below are the cases which cannot be moved into tables easily. */
--
2.1.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
