diff options
| author | Marek Olšák <[email protected]> | 2014-10-02 16:36:51 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-10-04 15:36:39 +0200 |
| commit | 0c4bc1e29223ffec4617999c0c03d722bdcc170a (patch) | |
| tree | ecae2a4b7708df339d2189a156357a9d4aa2452c /src/gallium/auxiliary/tgsi | |
| parent | 1f6c0b55df9f3553b18062ad2c7e2dc021d4c731 (diff) | |
tgsi: change tgsi_shader_info::properties to a one-dimensional array
Reviewed-by: Roland Scheidegger <[email protected]>
v2: fix svga too
Diffstat (limited to 'src/gallium/auxiliary/tgsi')
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_scan.c | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_scan.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c index d68dca81713..42bc61eeb4c 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.c +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c @@ -280,8 +280,7 @@ tgsi_scan_shader(const struct tgsi_token *tokens, unsigned name = fullprop->Property.PropertyName; assert(name < Elements(info->properties)); - memcpy(info->properties[name], - fullprop->u, 8 * sizeof(unsigned)); + info->properties[name] = fullprop->u[0].Data; } break; @@ -298,7 +297,7 @@ tgsi_scan_shader(const struct tgsi_token *tokens, */ if (procType == TGSI_PROCESSOR_GEOMETRY) { unsigned input_primitive = - info->properties[TGSI_PROPERTY_GS_INPUT_PRIM][0]; + info->properties[TGSI_PROPERTY_GS_INPUT_PRIM]; int num_verts = u_vertices_per_prim(input_primitive); int j; info->file_count[TGSI_FILE_INPUT] = num_verts; diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h index 934aceca4c6..b02b018b633 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.h +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h @@ -88,7 +88,7 @@ struct tgsi_shader_info */ unsigned indirect_files; - unsigned properties[TGSI_PROPERTY_COUNT][8]; /* index with TGSI_PROPERTY_ */ + unsigned properties[TGSI_PROPERTY_COUNT]; /* index with TGSI_PROPERTY_ */ }; extern void |