PixelShaderGen: Fix various merge conflicts and a critical regression from revision 32b78a85.

This commit is contained in:
NeoBrainX
2013-06-17 12:51:57 +02:00
parent c505260ec1
commit 7a01ceba73
2 changed files with 25 additions and 23 deletions

View File

@ -171,6 +171,7 @@ struct pixel_shader_uid_data
u32 ztex_op : 2;
u32 fast_depth_calc : 1;
u32 per_pixel_depth : 1;
u32 bHasIndStage : 16;