diff options
| author | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-06-09 13:59:16 +0300 |
|---|---|---|
| committer | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-06-10 00:26:26 +0300 |
| commit | f86b63edb69dc7f48f7d10af81407a147c13bd00 (patch) | |
| tree | ef56c8ea4d0f6ddc43dcc73195cb8d741d248568 | |
| parent | ba92a0fcc3241c31e86dcc0c12160adaab66621b (diff) | |
mesa/program: Use sampler object state if present
CompareFailValue is part of Sampler state that needs to be read from
bound sampler object if present.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
| -rw-r--r-- | src/mesa/program/prog_statevars.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 98ab9d0032..7ab5773f81 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -36,6 +36,7 @@ #include "main/mtypes.h" #include "prog_statevars.h" #include "prog_parameter.h" +#include "main/samplerobj.h" /** @@ -555,11 +556,13 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], const int unit = (int) state[2]; const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; + const struct gl_sampler_object *samp = + _mesa_get_samplerobj(ctx, unit); if (texObj) { value[0] = value[1] = value[2] = - value[3] = texObj->Sampler.CompareFailValue; + value[3] = samp->CompareFailValue; } } return; |