i965/nir: Do not scalarize phis in non-scalar setups

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_state_tex.c

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
index 807e2f3dec92f759442a64847ef8a7d17dfc2cda..15eaa71531bde56b67f1d1b30b248439ba51208a 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
@@ -32,24 +32,25 @@
 #include "nv_object.xml.h"
 #include "nv04_3d.xml.h"
 #include "nv04_driver.h"
+#include "main/samplerobj.h"
 
 static uint32_t
 get_tex_format(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_A8:
-       case MESA_FORMAT_L8:
-       case MESA_FORMAT_I8:
+       case MESA_FORMAT_A_UNORM8:
+       case MESA_FORMAT_L_UNORM8:
+       case MESA_FORMAT_I_UNORM8:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_Y8;
-       case MESA_FORMAT_ARGB1555:
+       case MESA_FORMAT_B5G5R5A1_UNORM:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_A1R5G5B5;
-       case MESA_FORMAT_ARGB4444:
+       case MESA_FORMAT_B4G4R4A4_UNORM:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_A4R4G4B4;
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_R5G6B5;
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_A8R8G8B8;
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV04_TEXTURED_TRIANGLE_FORMAT_COLOR_X8R8G8B8;
        default:
                assert(0);
@@ -64,9 +65,10 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
        struct nouveau_surface *s;
        uint32_t format = 0xa0, filter = 0x1010;
 
-       if (ctx->Texture.Unit[i]._ReallyEnabled) {
+       if (ctx->Texture.Unit[i]._Current) {
                struct gl_texture_object *t = ctx->Texture.Unit[i]._Current;
                struct gl_texture_image *ti = t->Image[0][t->BaseLevel];
+               const struct gl_sampler_object *sa = _mesa_get_samplerobj(ctx, i);
                int lod_max = 1, lod_bias = 0;
 
                if (!nouveau_texture_validate(ctx, t))
@@ -74,26 +76,26 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
 
                s = &to_nouveau_texture(t)->surfaces[t->BaseLevel];
 
-               if (t->Sampler.MinFilter != GL_NEAREST &&
-                   t->Sampler.MinFilter != GL_LINEAR) {
-                       lod_max = CLAMP(MIN2(t->Sampler.MaxLod, t->_MaxLambda),
+               if (sa->MinFilter != GL_NEAREST &&
+                   sa->MinFilter != GL_LINEAR) {
+                       lod_max = CLAMP(MIN2(sa->MaxLod, t->_MaxLambda),
                                        0, 15) + 1;
 
                        lod_bias = CLAMP(ctx->Texture.Unit[i].LodBias +
-                                        t->Sampler.LodBias, -16, 15) * 8;
+                                        sa->LodBias, -16, 15) * 8;
                }
 
-               format |= nvgl_wrap_mode(t->Sampler.WrapT) << 28 |
-                       nvgl_wrap_mode(t->Sampler.WrapS) << 24 |
+               format |= nvgl_wrap_mode(sa->WrapT) << 28 |
+                       nvgl_wrap_mode(sa->WrapS) << 24 |
                        ti->HeightLog2 << 20 |
                        ti->WidthLog2 << 16 |
                        lod_max << 12 |
                        get_tex_format(ti);
 
-               filter |= log2i(t->Sampler.MaxAnisotropy) << 31 |
-                       nvgl_filter_mode(t->Sampler.MagFilter) << 28 |
-                       log2i(t->Sampler.MaxAnisotropy) << 27 |
-                       nvgl_filter_mode(t->Sampler.MinFilter) << 24 |
+               filter |= log2i(sa->MaxAnisotropy) << 31 |
+                       nvgl_filter_mode(sa->MagFilter) << 28 |
+                       log2i(sa->MaxAnisotropy) << 27 |
+                       nvgl_filter_mode(sa->MinFilter) << 24 |
                        (lod_bias & 0xff) << 16;
 
        } else {