X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnv20_state_tex.c;h=b0a4c9fb0976edfe40a108a2494ff7fb19b067e4;hb=da9e6fdfe27065b8ede8b2fe30c8cccc3b573245;hp=7af721850e22c59db36eb32704c9ad5f69d05042;hpb=ef145ba4ded6aafb28e3bda02fb348e6b8bff12a;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
index 7af721850e2..b0a4c9fb097 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
@@ -90,23 +90,23 @@ get_tex_format_pot(struct gl_texture_image *ti)
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A8R8G8B8;
 
-	case MESA_FORMAT_ARGB1555:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A1R5G5B5;
 
-	case MESA_FORMAT_ARGB4444:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A4R4G4B4;
 
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_X8R8G8B8;
 
-	case MESA_FORMAT_RGB565:
+	case MESA_FORMAT_B5G6R5_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_R5G6B5;
 
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_I8:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
 		return NV20_3D_TEX_FORMAT_FORMAT_I8;
 
-	case MESA_FORMAT_L8:
+	case MESA_FORMAT_L_UNORM8:
 		return NV20_3D_TEX_FORMAT_FORMAT_L8;
 
 	case MESA_FORMAT_RGB_DXT1:
@@ -131,23 +131,23 @@ get_tex_format_rect(struct gl_texture_image *ti)
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A8R8G8B8_RECT;
 
-	case MESA_FORMAT_ARGB1555:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A1R5G5B5_RECT;
 
-	case MESA_FORMAT_ARGB4444:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_A4R4G4B4_RECT;
 
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_R8G8B8_RECT;
 
-	case MESA_FORMAT_RGB565:
+	case MESA_FORMAT_B5G6R5_UNORM:
 		return NV20_3D_TEX_FORMAT_FORMAT_R5G6B5_RECT;
 
-	case MESA_FORMAT_L8:
+	case MESA_FORMAT_L_UNORM8:
 		return NV20_3D_TEX_FORMAT_FORMAT_L8_RECT;
 
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_I8:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
 		return NV20_3D_TEX_FORMAT_FORMAT_I8_RECT;
 
 	default:
@@ -169,7 +169,7 @@ nv20_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, NV20_3D(TEX_ENABLE(i)), 1);
 		PUSH_DATA (push, 0);
 
@@ -263,7 +263,7 @@ nv20_emit_tex_shader(struct gl_context *ctx, int emit)
 	int i;
 
 	for (i = 0; i < NV20_TEXTURE_UNITS; i++) {
-		if (!ctx->Texture.Unit[i]._ReallyEnabled)
+		if (!ctx->Texture.Unit[i]._Current)
 			continue;
 
 		tx_shader_op |= NV20_3D_TEX_SHADER_OP_TX0_TEXTURE_2D << 5 * i;