summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <brian@i915.localnet.net>2007-08-07 18:22:40 -0600
committerBrian <brian@i915.localnet.net>2007-08-07 18:24:30 -0600
commitddd30d8160dc7db5f24a5ac823fd1c64c43b50be (patch)
treedea2ddba02af10ae68114a23087721d163ff96d8 /src
parente4b5265487c3d912ea84511064681e02f3e2a5ba (diff)
clean up tgsi_sampler-related bits
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/tgsi/core/tgsi_exec.c8
-rw-r--r--src/mesa/pipe/tgsi/core/tgsi_exec.h23
2 files changed, 10 insertions, 21 deletions
diff --git a/src/mesa/pipe/tgsi/core/tgsi_exec.c b/src/mesa/pipe/tgsi/core/tgsi_exec.c
index 71dfbc10f3..87dab9956f 100644
--- a/src/mesa/pipe/tgsi/core/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/core/tgsi_exec.c
@@ -65,7 +65,7 @@ tgsi_exec_machine_init(
struct tgsi_exec_machine *mach,
struct tgsi_token *tokens,
GLuint numSamplers,
- const struct tgsi_sampler_state *samplers)
+ const struct tgsi_sampler *samplers)
{
GLuint i, k;
struct tgsi_parse_context parse;
@@ -1040,7 +1040,7 @@ exec_kil (struct tgsi_exec_machine *mach,
*/
static void
fetch_texel_1d( GLcontext *ctx,
- const struct tgsi_sampler_state *sampler,
+ const struct tgsi_sampler *sampler,
const union tgsi_exec_channel *s,
GLuint unit,
union tgsi_exec_channel *r,
@@ -1097,7 +1097,7 @@ fetch_texel_1d( GLcontext *ctx,
*/
static void
fetch_texel_2d( GLcontext *ctx,
- const struct tgsi_sampler_state *sampler,
+ const struct tgsi_sampler *sampler,
const union tgsi_exec_channel *s,
const union tgsi_exec_channel *t,
GLuint unit,
@@ -1166,7 +1166,7 @@ fetch_texel_2d( GLcontext *ctx,
*/
static void
fetch_texel_3d( GLcontext *ctx,
- const struct tgsi_sampler_state *sampler,
+ const struct tgsi_sampler *sampler,
const union tgsi_exec_channel *s,
const union tgsi_exec_channel *t,
const union tgsi_exec_channel *p,
diff --git a/src/mesa/pipe/tgsi/core/tgsi_exec.h b/src/mesa/pipe/tgsi/core/tgsi_exec.h
index b92d1b5918..1c714ad553 100644
--- a/src/mesa/pipe/tgsi/core/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/core/tgsi_exec.h
@@ -21,24 +21,13 @@ struct tgsi_exec_vector
union tgsi_exec_channel xyzw[4];
};
-struct tgsi_sampler_state
+struct tgsi_sampler
{
const struct pipe_sampler_state *state;
- const struct pipe_mipmap_tree *texture;
- void (*get_sample)(const struct tgsi_sampler_state *sampler,
+ struct pipe_mipmap_tree *texture;
+ void (*get_sample)(struct tgsi_sampler *sampler,
const GLfloat strq[4], GLfloat rgba[4]);
-
-#if 0
- GLboolean NeedLambda;
- GLboolean NeedLodBias; /* if NeedLambda */
- GLboolean NeedLambdaClamp; /* if NeedLambda */
- GLfloat LodBias; /* if NeedLodBias */
- GLfloat MinLod; /* if NeedLambdaClamp */
- GLfloat MaxLod; /* if NeedLambdaClamp */
- GLfloat ImageWidth;
- GLfloat ImageHeight;
- GLfloat ImageDepth;
-#endif
+ void *pipe; /*XXX temporary*/
};
struct tgsi_exec_labels
@@ -124,7 +113,7 @@ struct tgsi_exec_machine
struct tgsi_exec_vector *Temps;
struct tgsi_exec_vector *Addrs;
- const struct tgsi_sampler_state *Samplers;
+ struct tgsi_sampler *Samplers;
GLfloat Imms[256][4];
GLuint ImmLimit;
@@ -147,7 +136,7 @@ tgsi_exec_machine_init(
struct tgsi_exec_machine *mach,
struct tgsi_token *tokens,
GLuint numSamplers,
- const struct tgsi_sampler_state *samplers);
+ const struct tgsi_sampler *samplers);
void
tgsi_exec_prepare(