OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/tgsi: Define the TGSI_BUFFER texture target.

Browse Source 
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.
This commit is contained in:
Francisco Jerez
2012-04-30 18:28:36 +02:00
parent 63428372ca
commit a4ebb04214
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/tgsi/tgsi_build.c
View File

@@ -709,7 +709,7 @@ tgsi_default_instruction_texture( void )
{ {
struct tgsi_instruction_texture instruction_texture; struct tgsi_instruction_texture instruction_texture;
instruction_texture.Texture = TGSI_TEXTURE_UNKNOWN; instruction_texture.Texture = TGSI_BUFFER;
instruction_texture.NumOffsets = 0; instruction_texture.NumOffsets = 0;
instruction_texture.Padding = 0; instruction_texture.Padding = 0;

2
src/gallium/auxiliary/tgsi/tgsi_strings.c
View File

@@ -79,7 +79,7 @@ const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] = const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] =
{ {
"UNKNOWN", "BUFFER",
"1D", "1D",
"2D", "2D",
"3D", "3D",

2
src/gallium/auxiliary/util/u_blitter.c
View File

@@ -674,7 +674,7 @@ pipe_tex_to_tgsi_tex(enum pipe_texture_target pipe_tex_target)
return TGSI_TEXTURE_2D_ARRAY; return TGSI_TEXTURE_2D_ARRAY;
default: default:
assert(0 && "unexpected texture target"); assert(0 && "unexpected texture target");
return TGSI_TEXTURE_UNKNOWN; return 0;
} }
} }

4
src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp
View File

@@ -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(SHADOW2D_ARRAY, 2D_ARRAY_SHADOW);
NV50_IR_TEX_TARG_CASE(SHADOWCUBE, CUBE_SHADOW); NV50_IR_TEX_TARG_CASE(SHADOWCUBE, CUBE_SHADOW);
NV50_IR_TEX_TARG_CASE(SHADOWRECT, RECT_SHADOW); NV50_IR_TEX_TARG_CASE(SHADOWRECT, RECT_SHADOW);
case TGSI_BUFFER:
case TGSI_TEXTURE_UNKNOWN: return nv50_ir::TEX_TARGET_BUFFER;
default: default:
assert(!"invalid texture target"); assert(!"invalid texture target");
return nv50_ir::TEX_TARGET_2D; return nv50_ir::TEX_TARGET_2D;

2
src/gallium/include/pipe/p_shader_tokens.h
View File

@@ -466,7 +466,7 @@ struct tgsi_instruction_label
unsigned Padding : 8; unsigned Padding : 8;
}; };
#define TGSI_TEXTURE_UNKNOWN 0 #define TGSI_BUFFER 0
#define TGSI_TEXTURE_1D 1 #define TGSI_TEXTURE_1D 1
#define TGSI_TEXTURE_2D 2 #define TGSI_TEXTURE_2D 2
#define TGSI_TEXTURE_3D 3 #define TGSI_TEXTURE_3D 3