[v4 4/4] d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
Paul Gofman
gofmanp at gmail.com
Mon Jun 19 04:24:24 CDT 2017
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
v4:
- updated to handle incomplete row of transposed matrix accordingly.
---
dlls/d3dx9_36/preshader.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c
index 9a2ecfa..39bd483 100644
--- a/dlls/d3dx9_36/preshader.c
+++ b/dlls/d3dx9_36/preshader.c
@@ -1138,7 +1138,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const
unsigned int table = const_set->table;
struct d3dx_parameter *param = const_set->param;
unsigned int element, i, j, start_offset;
- unsigned int param_offset;
struct const_upload_info info;
unsigned int *data = param->data;
enum pres_value_type param_type;
@@ -1178,24 +1177,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const
/* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer.
* All the supported types of parameters and table values have the same size. */
- for (i = 0; i < info.major_count; ++i)
- {
- for (j = 0; j < info.minor; ++j)
- {
- if (info.transpose)
- param_offset = i + j * info.major;
- else
- param_offset = i * info.minor + j;
- out[i * info.major_stride + j] = data[param_offset];
- }
- }
if (info.transpose)
{
+ for (i = 0; i < info.major_count; ++i)
+ for (j = 0; j < info.minor; ++j)
+ out[i * info.major_stride + j] = data[i + j * info.major];
+
for (j = 0; j < info.minor_remainder; ++j)
- {
- param_offset = i + j * info.major;
- out[i * info.major_stride + j] = data[param_offset];
- }
+ out[i * info.major_stride + j] = data[i + j * info.major]; }
+ else
+ {
+ for (i = 0; i < info.major_count; ++i)
+ for (j = 0; j < info.minor; ++j)
+ out[i * info.major_stride + j] = data[i * info.minor + j];
}
start_offset += get_offset_reg(table, const_set->register_count);
data += param->rows * param->columns;
--
2.9.4
More information about the wine-patches
mailing list