Fix some mistakes from the master merge; some cleanups.

This commit is contained in:
NeoBrainX
2013-04-29 19:37:32 +02:00
parent 5e6b712651
commit adab4e37f7
3 changed files with 8 additions and 19 deletions

View File

@ -86,7 +86,7 @@ struct pixel_shader_uid_data
u32 bc3 : 3;
u32 bi4 : 3;
u32 bc4 : 3;
void SetValues(int index, u32 texcoord, u32 texmap)
inline void SetValues(int index, u32 texcoord, u32 texmap)
{
if (index == 0) { bc0 = texcoord; bi0 = texmap; }
else if (index == 1) { bc1 = texcoord; bi1 = texmap; }
@ -180,7 +180,6 @@ struct pixel_shader_uid_data
u32 comp0 : 3;
u32 comp1 : 3;
u32 logic : 2;
// TODO: ref???
u32 use_zcomploc_hack : 1;
} alpha_test;
@ -194,12 +193,7 @@ struct pixel_shader_uid_data
u32 hex : 4;
} fog;
union {
struct {
u32 op : 2;
};
u32 hex : 2;
} ztex;
u32 ztex_op : 2;
u32 per_pixel_depth : 1;
u32 bHasIndStage : 16;