gallium/tgsi: s/TGSI_BUFFER/TGSI_TEXTURE_BUFFER/

For consistency.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 869faa1b42002fb1fcb0e024856e11aff0ef9db3..1c24b9bdbeda163a12b3ae4f5787ac72a9c0df32 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -259,7 +259,7 @@ tgsi_default_declaration_resource(void)
 {
    struct tgsi_declaration_resource dr;
 
-   dr.Resource = TGSI_BUFFER;
+   dr.Resource = TGSI_TEXTURE_BUFFER;
    dr.Raw = 0;
    dr.Writable = 0;
 
@@ -290,7 +290,7 @@ tgsi_default_declaration_sampler_view(void)
 {
    struct tgsi_declaration_sampler_view dsv;
 
-   dsv.Resource = TGSI_BUFFER;
+   dsv.Resource = TGSI_TEXTURE_BUFFER;
    dsv.ReturnTypeX = PIPE_TYPE_UNORM;
    dsv.ReturnTypeY = PIPE_TYPE_UNORM;
    dsv.ReturnTypeZ = PIPE_TYPE_UNORM;

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp
index ba08493c282beeea6603c998308a0fc6d7174a1a..16f191da159884a27eba6b558d3c2bf7656ab448 100644 (file)
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp
@@ -347,8 +347,7 @@ static nv50_ir::TexTarget translateTexture(uint tex)
    NV50_IR_TEX_TARG_CASE(SHADOW2D_ARRAY, 2D_ARRAY_SHADOW);
    NV50_IR_TEX_TARG_CASE(SHADOWCUBE, CUBE_SHADOW);
    NV50_IR_TEX_TARG_CASE(SHADOWRECT, RECT_SHADOW);
-   case TGSI_BUFFER:
-      return nv50_ir::TEX_TARGET_BUFFER;
+   NV50_IR_TEX_TARG_CASE(BUFFER, BUFFER);
 
    case TGSI_TEXTURE_UNKNOWN:
    default:

diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index 615a89a220616ec8b41b3271304369f5cf1c0ce4..6b58293f409086edb15250ead004cd347e4dc3bc 100644 (file)
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -490,7 +490,7 @@ struct tgsi_instruction_label
    unsigned Padding  : 8;
 };
 
-#define TGSI_BUFFER                 0
+#define TGSI_TEXTURE_BUFFER         0
 #define TGSI_TEXTURE_1D             1
 #define TGSI_TEXTURE_2D             2
 #define TGSI_TEXTURE_3D             3