[v5 8/8] d3dx9: Implement setting named shader constants in effect.

Paul Gofman gofmanp at gmail.com
Tue Mar 22 17:48:52 CDT 2016


On 03/23/2016 01:09 AM, Matteo Bruni wrote:
>
>> diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c
>> index fec9de4..1770046 100644
>> --- a/dlls/d3dx9_36/preshader.c
>> +++ b/dlls/d3dx9_36/preshader.c
>> @@ -242,7 +242,7 @@ static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, vo
>>  static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx)
>>  {
>>      return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] &
>> -            (1ul << (reg_idx % PRES_BITMASK_BLOCK_SIZE));
>> +            (1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE));
> When you end up changing stuff introduced in a previous patch in the
> series you know there is something wrong ;)
> I guess it's a rebase glitch (by any chance, was this a remnant of a
> try with the uint_ptr idea you mentioned earlier?)
>
Yes, I put uint_ptr in, then realized that it would require an extra
include to the common header file, or using ULONG_PTR instead (for which
I was not sure if it is decent enough :), so I gave up as the difference
introduced by this looked not important really. So I got back in patch
stack and changed 1ul's, which were introduced in two different patches,
and took a wrong (later) patch for the second change. So I saw 1u in the
final file and I did not notice this mess in between, sorry.




More information about the wine-devel mailing list