diff options
| author | Francisco Jerez <[email protected]> | 2012-04-30 18:28:36 +0200 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2012-05-11 12:39:40 +0200 |
| commit | a4ebb04214bab1cd9bd41967232ec89441e31744 (patch) | |
| tree | 2723ec4571dce55d45415116e426690619ed1546 | |
| parent | 63428372cadc73a7124f4e7d383eb86a0c7affd7 (diff) | |
gallium/tgsi: Define the TGSI_BUFFER texture target.
This texture type was already referred to by the documentation but it
was never defined. Define it as 0 to match the pipe_texture_target
enumeration values.
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_build.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_strings.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index b4f50038bed..1bcdef2e2f2 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_build.c +++ b/src/gallium/auxiliary/tgsi/tgsi_build.c @@ -709,7 +709,7 @@ tgsi_default_instruction_texture( void ) { struct tgsi_instruction_texture instruction_texture; - instruction_texture.Texture = TGSI_TEXTURE_UNKNOWN; + instruction_texture.Texture = TGSI_BUFFER; instruction_texture.NumOffsets = 0; instruction_texture.Padding = 0; diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c b/src/gallium/auxiliary/tgsi/tgsi_strings.c index 3c7ab3b1657..1d959b6e0e9 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_strings.c +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c @@ -79,7 +79,7 @@ const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] = const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] = { - "UNKNOWN", + "BUFFER", "1D", "2D", "3D", diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index d0b9187d1f9..28e73832540 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -674,7 +674,7 @@ pipe_tex_to_tgsi_tex(enum pipe_texture_target pipe_tex_target) return TGSI_TEXTURE_2D_ARRAY; default: assert(0 && "unexpected texture target"); - return TGSI_TEXTURE_UNKNOWN; + return 0; } } 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 6d0147bc53f..955eb92ec3c 100644 --- 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,8 @@ 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_TEXTURE_UNKNOWN: + case TGSI_BUFFER: + return nv50_ir::TEX_TARGET_BUFFER; default: assert(!"invalid texture target"); return nv50_ir::TEX_TARGET_2D; diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 3c970723d35..a62d7a2b94d 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -466,7 +466,7 @@ struct tgsi_instruction_label unsigned Padding : 8; }; -#define TGSI_TEXTURE_UNKNOWN 0 +#define TGSI_BUFFER 0 #define TGSI_TEXTURE_1D 1 #define TGSI_TEXTURE_2D 2 #define TGSI_TEXTURE_3D 3 |