ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Move transpose 'if' outside of the inner loop in set_constants(). 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2017-06-22 16:11:56 +03:00 committed by Alexandre Julliard
parent 0029128464
commit 08df007e80
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/d3dx9_36/preshader.c
View File

@ -1141,7 +1141,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const
unsigned int table = const_set->table; unsigned int table = const_set->table;
struct d3dx_parameter *param = const_set->param; struct d3dx_parameter *param = const_set->param;
unsigned int element, i, j, start_offset; unsigned int element, i, j, start_offset;
unsigned int param_offset;
struct const_upload_info info; struct const_upload_info info;
unsigned int *data = param->data; unsigned int *data = param->data;
enum pres_value_type param_type; enum pres_value_type param_type;
@ -1181,24 +1180,20 @@ 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. /* 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. */ * All the supported types of parameters and table values have the same size. */
if (info.transpose)
{
for (i = 0; i < info.major_count; ++i) for (i = 0; i < info.major_count; ++i)
{
for (j = 0; j < info.minor; ++j) for (j = 0; j < info.minor; ++j)
{ out[i * info.major_stride + j] = data[i + j * info.major];
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 (j = 0; j < info.minor_remainder; ++j) for (j = 0; j < info.minor_remainder; ++j)
{ out[i * info.major_stride + j] = data[i + j * info.major];
param_offset = i + j * info.major;
out[i * info.major_stride + j] = data[param_offset];
} }
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); start_offset += get_offset_reg(table, const_set->register_count);
data += param->rows * param->columns; data += param->rows * param->columns;