/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
declaration.Dimension = 0;
declaration.Semantic = 0;
declaration.Invariant = 0;
+ declaration.Local = 0;
+ declaration.Array = 0;
+ declaration.Padding = 0;
return declaration;
}
unsigned dimension,
unsigned semantic,
unsigned invariant,
+ unsigned local,
+ unsigned array,
struct tgsi_header *header )
{
struct tgsi_declaration declaration;
declaration.Dimension = dimension;
declaration.Semantic = semantic;
declaration.Invariant = invariant;
-
+ declaration.Local = local;
+ declaration.Array = array;
header_bodysize_grow( header );
return declaration;
struct tgsi_declaration_interp di;
di.Interpolate = TGSI_INTERPOLATE_CONSTANT;
- di.Centroid = 0;
+ di.Location = TGSI_INTERPOLATE_LOC_CENTER;
di.CylindricalWrap = 0;
+ di.Padding = 0;
return di;
}
static struct tgsi_declaration_interp
tgsi_build_declaration_interp(unsigned interpolate,
- unsigned centroid,
+ unsigned interpolate_location,
unsigned cylindrical_wrap,
struct tgsi_declaration *declaration,
struct tgsi_header *header)
struct tgsi_declaration_interp di;
di.Interpolate = interpolate;
- di.Centroid = centroid;
+ di.Location = interpolate_location;
di.CylindricalWrap = cylindrical_wrap;
+ di.Padding = 0;
declaration_grow(declaration, header);
{
struct tgsi_declaration_resource dr;
- dr.Resource = TGSI_BUFFER;
+ dr.Resource = TGSI_TEXTURE_BUFFER;
dr.Raw = 0;
dr.Writable = 0;
+ dr.Padding = 0;
return dr;
}
{
struct tgsi_declaration_sampler_view dsv;
- dsv.Resource = TGSI_BUFFER;
- dsv.ReturnTypeX = PIPE_TYPE_UNORM;
- dsv.ReturnTypeY = PIPE_TYPE_UNORM;
- dsv.ReturnTypeZ = PIPE_TYPE_UNORM;
- dsv.ReturnTypeW = PIPE_TYPE_UNORM;
+ dsv.Resource = TGSI_TEXTURE_BUFFER;
+ dsv.ReturnTypeX = TGSI_RETURN_TYPE_UNORM;
+ dsv.ReturnTypeY = TGSI_RETURN_TYPE_UNORM;
+ dsv.ReturnTypeZ = TGSI_RETURN_TYPE_UNORM;
+ dsv.ReturnTypeW = TGSI_RETURN_TYPE_UNORM;
return dsv;
}
}
+static struct tgsi_declaration_array
+tgsi_default_declaration_array( void )
+{
+ struct tgsi_declaration_array a;
+
+ a.ArrayID = 0;
+ a.Padding = 0;
+
+ return a;
+}
+
+static struct tgsi_declaration_array
+tgsi_build_declaration_array(unsigned arrayid,
+ struct tgsi_declaration *declaration,
+ struct tgsi_header *header)
+{
+ struct tgsi_declaration_array da;
+
+ da = tgsi_default_declaration_array();
+ da.ArrayID = arrayid;
+
+ declaration_grow(declaration, header);
+
+ return da;
+}
+
struct tgsi_full_declaration
tgsi_default_full_declaration( void )
{
full_declaration.Range = tgsi_default_declaration_range();
full_declaration.Semantic = tgsi_default_declaration_semantic();
full_declaration.Interp = tgsi_default_declaration_interp();
- full_declaration.ImmediateData.u = NULL;
full_declaration.Resource = tgsi_default_declaration_resource();
full_declaration.SamplerView = tgsi_default_declaration_sampler_view();
+ full_declaration.Array = tgsi_default_declaration_array();
return full_declaration;
}
full_decl->Declaration.Dimension,
full_decl->Declaration.Semantic,
full_decl->Declaration.Invariant,
+ full_decl->Declaration.Local,
+ full_decl->Declaration.Array,
header );
if (maxsize <= size)
size++;
*di = tgsi_build_declaration_interp(full_decl->Interp.Interpolate,
- full_decl->Interp.Centroid,
+ full_decl->Interp.Location,
full_decl->Interp.CylindricalWrap,
declaration,
header);
header );
}
- if (full_decl->Declaration.File == TGSI_FILE_IMMEDIATE_ARRAY) {
- unsigned i, j;
- union tgsi_immediate_data *data;
-
- for (i = 0; i <= dr->Last; ++i) {
- for (j = 0; j < 4; ++j) {
- unsigned idx = i*4 + j;
- if (maxsize <= size)
- return 0;
- data = (union tgsi_immediate_data *) &tokens[size];
- ++size;
-
- *data = full_decl->ImmediateData.u[idx];
- declaration_grow( declaration, header );
- }
- }
- }
-
if (full_decl->Declaration.File == TGSI_FILE_RESOURCE) {
struct tgsi_declaration_resource *dr;
header);
}
+ if (full_decl->Declaration.Array) {
+ struct tgsi_declaration_array *da;
+
+ if (maxsize <= size) {
+ return 0;
+ }
+ da = (struct tgsi_declaration_array *)&tokens[size];
+ size++;
+ *da = tgsi_build_declaration_array(
+ full_decl->Array.ArrayID,
+ declaration,
+ header);
+ }
return size;
}
static struct tgsi_immediate
tgsi_build_immediate(
- struct tgsi_header *header )
+ struct tgsi_header *header,
+ unsigned type )
{
struct tgsi_immediate immediate;
immediate = tgsi_default_immediate();
+ immediate.DataType = type;
header_bodysize_grow( header );
header_bodysize_grow( header );
}
-static union tgsi_immediate_data
-tgsi_build_immediate_float32(
- float value,
- struct tgsi_immediate *immediate,
- struct tgsi_header *header )
-{
- union tgsi_immediate_data immediate_data;
-
- immediate_data.Float = value;
-
- immediate_grow( immediate, header );
-
- return immediate_data;
-}
-
unsigned
tgsi_build_full_immediate(
const struct tgsi_full_immediate *full_imm,
immediate = (struct tgsi_immediate *) &tokens[size];
size++;
- *immediate = tgsi_build_immediate( header );
+ *immediate = tgsi_build_immediate( header, full_imm->Immediate.DataType );
assert( full_imm->Immediate.NrTokens <= 4 + 1 );
if( maxsize <= size )
return 0;
+
data = (union tgsi_immediate_data *) &tokens[size];
- size++;
+ *data = full_imm->u[i];
- *data = tgsi_build_immediate_float32(
- full_imm->u[i].Float,
- immediate,
- header );
+ immediate_grow( immediate, header );
+ size++;
}
return size;
{
struct tgsi_instruction_texture instruction_texture;
- instruction_texture.Texture = TGSI_BUFFER;
+ instruction_texture.Texture = TGSI_TEXTURE_UNKNOWN;
instruction_texture.NumOffsets = 0;
instruction_texture.Padding = 0;
return src_register;
}
+static struct tgsi_ind_register
+tgsi_default_ind_register( void )
+{
+ struct tgsi_ind_register ind_register;
+
+ ind_register.File = TGSI_FILE_NULL;
+ ind_register.Index = 0;
+ ind_register.Swizzle = TGSI_SWIZZLE_X;
+ ind_register.ArrayID = 0;
+
+ return ind_register;
+}
+
+static struct tgsi_ind_register
+tgsi_build_ind_register(
+ unsigned file,
+ unsigned swizzle,
+ int index,
+ unsigned arrayid,
+ struct tgsi_instruction *instruction,
+ struct tgsi_header *header )
+{
+ struct tgsi_ind_register ind_register;
+
+ assert( file < TGSI_FILE_COUNT );
+ assert( swizzle <= TGSI_SWIZZLE_W );
+ assert( index >= -0x8000 && index <= 0x7FFF );
+
+ ind_register.File = file;
+ ind_register.Swizzle = swizzle;
+ ind_register.Index = index;
+ ind_register.ArrayID = arrayid;
+
+ instruction_grow( instruction, header );
+
+ return ind_register;
+}
+
static struct tgsi_dimension
tgsi_default_dimension( void )
{
struct tgsi_full_src_register full_src_register;
full_src_register.Register = tgsi_default_src_register();
- full_src_register.Indirect = tgsi_default_src_register();
+ full_src_register.Indirect = tgsi_default_ind_register();
full_src_register.Dimension = tgsi_default_dimension();
- full_src_register.DimIndirect = tgsi_default_src_register();
+ full_src_register.DimIndirect = tgsi_default_ind_register();
return full_src_register;
}
struct tgsi_full_dst_register full_dst_register;
full_dst_register.Register = tgsi_default_dst_register();
- full_dst_register.Indirect = tgsi_default_src_register();
+ full_dst_register.Indirect = tgsi_default_ind_register();
full_dst_register.Dimension = tgsi_default_dimension();
- full_dst_register.DimIndirect = tgsi_default_src_register();
+ full_dst_register.DimIndirect = tgsi_default_ind_register();
return full_dst_register;
}
header );
if( reg->Register.Indirect ) {
- struct tgsi_src_register *ind;
+ struct tgsi_ind_register *ind;
if( maxsize <= size )
return 0;
- ind = (struct tgsi_src_register *) &tokens[size];
+ ind = (struct tgsi_ind_register *) &tokens[size];
size++;
- *ind = tgsi_build_src_register(
+ *ind = tgsi_build_ind_register(
reg->Indirect.File,
- reg->Indirect.SwizzleX,
- reg->Indirect.SwizzleY,
- reg->Indirect.SwizzleZ,
- reg->Indirect.SwizzleW,
- reg->Indirect.Negate,
- reg->Indirect.Absolute,
- reg->Indirect.Indirect,
- reg->Indirect.Dimension,
+ reg->Indirect.Swizzle,
reg->Indirect.Index,
+ reg->Indirect.ArrayID,
instruction,
header );
}
header );
if( reg->Dimension.Indirect ) {
- struct tgsi_src_register *ind;
+ struct tgsi_ind_register *ind;
if( maxsize <= size )
return 0;
- ind = (struct tgsi_src_register *) &tokens[size];
+ ind = (struct tgsi_ind_register *) &tokens[size];
size++;
- *ind = tgsi_build_src_register(
+ *ind = tgsi_build_ind_register(
reg->DimIndirect.File,
- reg->DimIndirect.SwizzleX,
- reg->DimIndirect.SwizzleY,
- reg->DimIndirect.SwizzleZ,
- reg->DimIndirect.SwizzleW,
- reg->DimIndirect.Negate,
- reg->DimIndirect.Absolute,
- reg->DimIndirect.Indirect,
- reg->DimIndirect.Dimension,
+ reg->DimIndirect.Swizzle,
reg->DimIndirect.Index,
+ reg->DimIndirect.ArrayID,
instruction,
header );
}
header );
if( reg->Register.Indirect ) {
- struct tgsi_src_register *ind;
+ struct tgsi_ind_register *ind;
if( maxsize <= size )
return 0;
- ind = (struct tgsi_src_register *) &tokens[size];
+ ind = (struct tgsi_ind_register *) &tokens[size];
size++;
- *ind = tgsi_build_src_register(
+ *ind = tgsi_build_ind_register(
reg->Indirect.File,
- reg->Indirect.SwizzleX,
- reg->Indirect.SwizzleY,
- reg->Indirect.SwizzleZ,
- reg->Indirect.SwizzleW,
- reg->Indirect.Negate,
- reg->Indirect.Absolute,
- reg->Indirect.Indirect,
- reg->Indirect.Dimension,
+ reg->Indirect.Swizzle,
reg->Indirect.Index,
+ reg->Indirect.ArrayID,
instruction,
header );
}
header );
if( reg->Dimension.Indirect ) {
- struct tgsi_src_register *ind;
+ struct tgsi_ind_register *ind;
if( maxsize <= size )
return 0;
- ind = (struct tgsi_src_register *) &tokens[size];
+ ind = (struct tgsi_ind_register *) &tokens[size];
size++;
- *ind = tgsi_build_src_register(
+ *ind = tgsi_build_ind_register(
reg->DimIndirect.File,
- reg->DimIndirect.SwizzleX,
- reg->DimIndirect.SwizzleY,
- reg->DimIndirect.SwizzleZ,
- reg->DimIndirect.SwizzleW,
- reg->DimIndirect.Negate,
- reg->DimIndirect.Absolute,
- reg->DimIndirect.Indirect,
- reg->DimIndirect.Dimension,
+ reg->DimIndirect.Swizzle,
reg->DimIndirect.Index,
+ reg->DimIndirect.ArrayID,
instruction,
header );
}
projects / mesa.git / blobdiff