i965/vec4: Return the emitted instruction in emit_lrp()

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

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
index 3b76d66100d49739a5f86390568b8ead628610ac..d85adfa9cf72e7f97335303168a6555dfea5377c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
@@ -90,26 +90,26 @@ static uint32_t
 get_tex_format_pot(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A8R8G8B8;
 
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_X8R8G8B8;
 
-       case MESA_FORMAT_ARGB1555:
+       case MESA_FORMAT_B5G5R5A1_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5;
 
-       case MESA_FORMAT_ARGB4444:
+       case MESA_FORMAT_B4G4R4A4_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A4R4G4B4;
 
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5;
 
-       case MESA_FORMAT_A8:
-       case MESA_FORMAT_I8:
+       case MESA_FORMAT_A_UNORM8:
+       case MESA_FORMAT_I_UNORM8:
                return NV10_3D_TEX_FORMAT_FORMAT_I8;
 
-       case MESA_FORMAT_L8:
+       case MESA_FORMAT_L_UNORM8:
                return NV10_3D_TEX_FORMAT_FORMAT_L8;
 
        case MESA_FORMAT_RGB_DXT1:
@@ -131,19 +131,19 @@ static uint32_t
 get_tex_format_rect(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB1555:
+       case MESA_FORMAT_B5G5R5A1_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5_RECT;
 
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5_RECT;
 
-       case MESA_FORMAT_ARGB8888:
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A8R8G8B8_RECT;
 
-       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 NV10_3D_TEX_FORMAT_FORMAT_I8_RECT;
 
        default:
@@ -165,7 +165,7 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
 
        PUSH_RESET(push, BUFCTX_TEX(i));
 
-       if (!ctx->Texture.Unit[i]._ReallyEnabled) {
+       if (!ctx->Texture.Unit[i]._Current) {
                BEGIN_NV04(push, NV10_3D(TEX_ENABLE(i)), 1);
                PUSH_DATA (push, 0);
                return;