Skip to content
Snippets Groups Projects
Commit b27f206b authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau_vieux: fix build since sampler objects merge

parent 16d42af6
No related branches found
No related tags found
No related merge requests found
...@@ -82,11 +82,11 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -82,11 +82,11 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
if (t->Sampler.MinFilter != GL_NEAREST && if (t->Sampler.MinFilter != GL_NEAREST &&
t->Sampler.MinFilter != GL_LINEAR) { t->Sampler.MinFilter != GL_LINEAR) {
lod_max = CLAMP(MIN2(t->MaxLod, t->_MaxLambda), lod_max = CLAMP(MIN2(t->Sampler.MaxLod, t->_MaxLambda),
0, 15) + 1; 0, 15) + 1;
lod_bias = CLAMP(ctx->Texture.Unit[i].LodBias + lod_bias = CLAMP(ctx->Texture.Unit[i].LodBias +
t->LodBias, -16, 15) * 8; t->Sampler.LodBias, -16, 15) * 8;
} }
format |= nvgl_wrap_mode(t->Sampler.WrapT) << 28 | format |= nvgl_wrap_mode(t->Sampler.WrapT) << 28 |
...@@ -96,9 +96,9 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -96,9 +96,9 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
lod_max << 12 | lod_max << 12 |
get_tex_format(ti); get_tex_format(ti);
filter |= log2i(t->MaxAnisotropy) << 31 | filter |= log2i(t->Sampler.MaxAnisotropy) << 31 |
nvgl_filter_mode(t->Sampler.MagFilter) << 28 | nvgl_filter_mode(t->Sampler.MagFilter) << 28 |
log2i(t->MaxAnisotropy) << 27 | log2i(t->Sampler.MaxAnisotropy) << 27 |
nvgl_filter_mode(t->Sampler.MinFilter) << 24 | nvgl_filter_mode(t->Sampler.MinFilter) << 24 |
(lod_bias & 0xff) << 16; (lod_bias & 0xff) << 16;
......
...@@ -183,7 +183,7 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -183,7 +183,7 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
| nvgl_filter_mode(t->Sampler.MinFilter) << 24; | nvgl_filter_mode(t->Sampler.MinFilter) << 24;
tx_enable = NV10_3D_TEX_ENABLE_ENABLE tx_enable = NV10_3D_TEX_ENABLE_ENABLE
| log2i(t->MaxAnisotropy) << 4; | log2i(t->Sampler.MaxAnisotropy) << 4;
if (t->Target == GL_TEXTURE_RECTANGLE) { if (t->Target == GL_TEXTURE_RECTANGLE) {
BEGIN_RING(chan, celsius, NV10_3D_TEX_NPOT_PITCH(i), 1); BEGIN_RING(chan, celsius, NV10_3D_TEX_NPOT_PITCH(i), 1);
...@@ -198,9 +198,9 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -198,9 +198,9 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
if (t->Sampler.MinFilter != GL_NEAREST && if (t->Sampler.MinFilter != GL_NEAREST &&
t->Sampler.MinFilter != GL_LINEAR) { t->Sampler.MinFilter != GL_LINEAR) {
int lod_min = t->MinLod; int lod_min = t->Sampler.MinLod;
int lod_max = MIN2(t->MaxLod, t->_MaxLambda); int lod_max = MIN2(t->Sampler.MaxLod, t->_MaxLambda);
int lod_bias = t->LodBias int lod_bias = t->Sampler.LodBias
+ ctx->Texture.Unit[i].LodBias; + ctx->Texture.Unit[i].LodBias;
lod_max = CLAMP(lod_max, 0, 15); lod_max = CLAMP(lod_max, 0, 15);
......
...@@ -195,7 +195,7 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -195,7 +195,7 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
| 2 << 12; | 2 << 12;
tx_enable = NV20_3D_TEX_ENABLE_ENABLE tx_enable = NV20_3D_TEX_ENABLE_ENABLE
| log2i(t->MaxAnisotropy) << 4; | log2i(t->Sampler.MaxAnisotropy) << 4;
if (t->Target == GL_TEXTURE_RECTANGLE) { if (t->Target == GL_TEXTURE_RECTANGLE) {
BEGIN_RING(chan, kelvin, NV20_3D_TEX_NPOT_PITCH(i), 1); BEGIN_RING(chan, kelvin, NV20_3D_TEX_NPOT_PITCH(i), 1);
...@@ -210,9 +210,9 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit) ...@@ -210,9 +210,9 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
if (t->Sampler.MinFilter != GL_NEAREST && if (t->Sampler.MinFilter != GL_NEAREST &&
t->Sampler.MinFilter != GL_LINEAR) { t->Sampler.MinFilter != GL_LINEAR) {
int lod_min = t->MinLod; int lod_min = t->Sampler.MinLod;
int lod_max = MIN2(t->MaxLod, t->_MaxLambda); int lod_max = MIN2(t->Sampler.MaxLod, t->_MaxLambda);
int lod_bias = t->LodBias int lod_bias = t->Sampler.LodBias
+ ctx->Texture.Unit[i].LodBias; + ctx->Texture.Unit[i].LodBias;
lod_max = CLAMP(lod_max, 0, 15); lod_max = CLAMP(lod_max, 0, 15);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment