ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give VSH and PSH types a prefix

This commit is contained in:
Jannik Vogel 2015-07-16 22:59:32 +02:00
parent d99880dac6
commit 811673cfde
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xbox/nv2a.c
View File

@ -1337,12 +1337,12 @@ typedef struct ShaderState {
bool alphakill[4];
bool alpha_test;
enum AlphaFunc alpha_func;
enum PshAlphaFunc alpha_func;
bool texture_matrix_enable[4];
enum Texgen texgen[4][4];
enum VshTexgen texgen[4][4];
enum Skinning skinning;
enum VshSkinning skinning;
bool normalization;

4
hw/xbox/nv2a_psh.c
View File

@ -204,7 +204,7 @@ struct PixelShader {
bool alphakill[4];
bool alpha_test;
enum AlphaFunc alpha_func;
enum PshAlphaFunc alpha_func;
QString *varE, *varF;
QString *code;
@ -769,7 +769,7 @@ QString *psh_translate(uint32_t combiner_control, uint32_t shader_stage_program,
const bool rect_tex[4],
const bool compare_mode[4][4],
const bool alphakill[4],
bool alpha_test, enum AlphaFunc alpha_func)
bool alpha_test, enum PshAlphaFunc alpha_func)
{
int i;
struct PixelShader ps;

4
hw/xbox/nv2a_psh.h
View File

@ -24,7 +24,7 @@
#include "qapi/qmp/qstring.h"
enum AlphaFunc {
enum PshAlphaFunc {
ALPHA_FUNC_NEVER,
ALPHA_FUNC_LESS,
ALPHA_FUNC_EQUAL,
@ -47,6 +47,6 @@ QString *psh_translate(uint32_t combiner_control, uint32_t shader_stage_program,
const bool rect_tex[4],
const bool compare_mode[4][4],
const bool alphakill[4],
bool alpha_test, enum AlphaFunc alpha_func);
bool alpha_test, enum PshAlphaFunc alpha_func);
#endif

4
hw/xbox/nv2a_vsh.h
View File

@ -24,7 +24,7 @@
#include "qapi/qmp/qstring.h"
enum Texgen {
enum VshTexgen {
TEXGEN_DISABLE,
TEXGEN_EYE_LINEAR,
TEXGEN_OBJECT_LINEAR,
@ -33,7 +33,7 @@ enum Texgen {
TEXGEN_REFLECTION_MAP,
};
enum Skinning {
enum VshSkinning {
SKINNING_OFF,
SKINNING_1WEIGHTS,
SKINNING_2WEIGHTS,