[PATCH] WineD3D: Rename the fragment ffp desc structures=0A=
Stefan Doesinger
stefan at codeweavers.com
Fri Nov 7 17:15:29 CST 2008
=0A=
This reflects the fact that they describe the fragment pipeline.=0A=
The vertex pipeline will use its own structures=0A=
---=0A=
dlls/wined3d/arb_program_shader.c | 14 +++++++-------=0A=
dlls/wined3d/ati_fragment_shader.c | 12 ++++++------=0A=
dlls/wined3d/utils.c | 22 +++++++++++-----------=0A=
dlls/wined3d/wined3d_private.h | 16 ++++++++--------=0A=
4 files changed, 32 insertions(+), 32 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/arb_program_shader.c =
b/dlls/wined3d/arb_program_shader.c=0A=
index cb89892..12148e6 100644=0A=
--- a/dlls/wined3d/arb_program_shader.c=0A=
+++ b/dlls/wined3d/arb_program_shader.c=0A=
@@ -2372,7 +2372,7 @@ const shader_backend_t arb_program_shader_backend =
=3D {=0A=
=0A=
struct arbfp_ffp_desc=0A=
{=0A=
- struct ffp_desc parent;=0A=
+ struct ffp_frag_desc parent;=0A=
GLuint shader;=0A=
unsigned int num_textures_used;=0A=
};=0A=
@@ -2401,7 +2401,7 @@ static HRESULT arbfp_alloc(IWineD3DDevice *iface) {=0A=
if(!This->fragment_priv) return E_OUTOFMEMORY;=0A=
}=0A=
priv =3D (struct shader_arb_priv *) This->fragment_priv;=0A=
- priv->fragment_shaders =3D hash_table_create(ffp_program_key_hash, =
ffp_program_key_compare);=0A=
+ priv->fragment_shaders =3D =
hash_table_create(ffp_frag_program_key_hash, =
ffp_frag_program_key_compare);=0A=
priv->use_arbfp_fixed_func =3D TRUE;=0A=
return WINED3D_OK;=0A=
}=0A=
@@ -2792,7 +2792,7 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, =
unsigned int stage, BOOL color,=0A=
}=0A=
=0A=
/* The stateblock is passed for GLINFO_LOCATION */=0A=
-static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, =
IWineD3DStateBlockImpl *stateblock) {=0A=
+static GLuint gen_arbfp_ffp_shader(struct ffp_frag_settings *settings, =
IWineD3DStateBlockImpl *stateblock) {=0A=
unsigned int stage;=0A=
SHADER_BUFFER buffer;=0A=
BOOL tex_read[MAX_TEXTURES] =3D {FALSE, FALSE, FALSE, FALSE, FALSE, =
FALSE, FALSE, FALSE};=0A=
@@ -3060,7 +3060,7 @@ static void fragment_prog_arbfp(DWORD state, =
IWineD3DStateBlockImpl *stateblock,=0A=
struct shader_arb_priv *priv =3D (struct shader_arb_priv *) =
device->fragment_priv;=0A=
BOOL use_pshader =3D use_ps(device);=0A=
BOOL use_vshader =3D use_vs(device);=0A=
- struct ffp_settings settings;=0A=
+ struct ffp_frag_settings settings;=0A=
struct arbfp_ffp_desc *desc;=0A=
unsigned int i;=0A=
=0A=
@@ -3082,8 +3082,8 @@ static void fragment_prog_arbfp(DWORD state, =
IWineD3DStateBlockImpl *stateblock,=0A=
IWineD3DPixelShader_CompileShader(stateblock->pixelShader);=0A=
} else {=0A=
/* Find or create a shader implementing the fixed function =
pipeline settings, then activate it */=0A=
- gen_ffp_op(stateblock, &settings, FALSE);=0A=
- desc =3D (struct arbfp_ffp_desc *) =
find_ffp_shader(priv->fragment_shaders, &settings);=0A=
+ gen_ffp_frag_op(stateblock, &settings, FALSE);=0A=
+ desc =3D (struct arbfp_ffp_desc *) =
find_ffp_frag_shader(priv->fragment_shaders, &settings);=0A=
if(!desc) {=0A=
desc =3D HeapAlloc(GetProcessHeap(), 0, sizeof(*desc));=0A=
if(!desc) {=0A=
@@ -3098,7 +3098,7 @@ static void fragment_prog_arbfp(DWORD state, =
IWineD3DStateBlockImpl *stateblock,=0A=
=0A=
memcpy(&desc->parent.settings, &settings, sizeof(settings));=0A=
desc->shader =3D gen_arbfp_ffp_shader(&settings, =
stateblock);=0A=
- add_ffp_shader(priv->fragment_shaders, &desc->parent);=0A=
+ add_ffp_frag_shader(priv->fragment_shaders, &desc->parent);=0A=
TRACE("Allocated fixed function replacement shader =
descriptor %p\n", desc);=0A=
}=0A=
=0A=
diff --git a/dlls/wined3d/ati_fragment_shader.c =
b/dlls/wined3d/ati_fragment_shader.c=0A=
index 10100e2..a53108e 100644=0A=
--- a/dlls/wined3d/ati_fragment_shader.c=0A=
+++ b/dlls/wined3d/ati_fragment_shader.c=0A=
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);=0A=
/* GL_ATI_fragment_shader specific fixed function pipeline description. =
"Inherits" from the common one */=0A=
struct atifs_ffp_desc=0A=
{=0A=
- struct ffp_desc parent;=0A=
+ struct ffp_frag_desc parent;=0A=
GLuint shader;=0A=
unsigned int num_textures_used;=0A=
};=0A=
@@ -803,13 +803,13 @@ static GLuint gen_ati_shader(struct =
texture_stage_op op[MAX_TEXTURES], WineD3D_G=0A=
static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
IWineD3DDeviceImpl *This =3D stateblock->wineD3DDevice;=0A=
struct atifs_ffp_desc *desc;=0A=
- struct ffp_settings settings;=0A=
+ struct ffp_frag_settings settings;=0A=
struct atifs_private_data *priv =3D (struct atifs_private_data *) =
This->fragment_priv;=0A=
DWORD mapped_stage;=0A=
unsigned int i;=0A=
=0A=
- gen_ffp_op(stateblock, &settings, TRUE);=0A=
- desc =3D (struct atifs_ffp_desc *) =
find_ffp_shader(priv->fragment_shaders, &settings);=0A=
+ gen_ffp_frag_op(stateblock, &settings, TRUE);=0A=
+ desc =3D (struct atifs_ffp_desc *) =
find_ffp_frag_shader(priv->fragment_shaders, &settings);=0A=
if(!desc) {=0A=
desc =3D HeapAlloc(GetProcessHeap(), 0, sizeof(*desc));=0A=
if(!desc) {=0A=
@@ -824,7 +824,7 @@ static void set_tex_op_atifs(DWORD state, =
IWineD3DStateBlockImpl *stateblock, Wi=0A=
=0A=
memcpy(&desc->parent.settings, &settings, sizeof(settings));=0A=
desc->shader =3D gen_ati_shader(settings.op, &GLINFO_LOCATION);=0A=
- add_ffp_shader(priv->fragment_shaders, &desc->parent);=0A=
+ add_ffp_frag_shader(priv->fragment_shaders, &desc->parent);=0A=
TRACE("Allocated fixed function replacement shader descriptor =
%p\n", desc);=0A=
}=0A=
=0A=
@@ -1074,7 +1074,7 @@ static HRESULT atifs_alloc(IWineD3DDevice *iface) {=0A=
return E_OUTOFMEMORY;=0A=
}=0A=
priv =3D (struct atifs_private_data *) This->fragment_priv;=0A=
- priv->fragment_shaders =3D hash_table_create(ffp_program_key_hash, =
ffp_program_key_compare);=0A=
+ priv->fragment_shaders =3D =
hash_table_create(ffp_frag_program_key_hash, =
ffp_frag_program_key_compare);=0A=
return WINED3D_OK;=0A=
}=0A=
=0A=
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c=0A=
index 93cfc41..b49072f 100644=0A=
--- a/dlls/wined3d/utils.c=0A=
+++ b/dlls/wined3d/utils.c=0A=
@@ -1793,7 +1793,7 @@ void *hash_table_get(struct hash_table_t *table, =
void *key)=0A=
}=0A=
=0A=
#define GLINFO_LOCATION stateblock->wineD3DDevice->adapter->gl_info=0A=
-void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings =
*settings, BOOL ignore_textype) {=0A=
+void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct =
ffp_frag_settings *settings, BOOL ignore_textype) {=0A=
#define ARG1 0x01=0A=
#define ARG2 0x02=0A=
#define ARG0 0x04=0A=
@@ -2013,13 +2013,13 @@ void gen_ffp_op(IWineD3DStateBlockImpl =
*stateblock, struct ffp_settings *setting=0A=
}=0A=
#undef GLINFO_LOCATION=0A=
=0A=
-struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, =
struct ffp_settings *settings)=0A=
+struct ffp_frag_desc *find_ffp_frag_shader(struct hash_table_t =
*fragment_shaders, struct ffp_frag_settings *settings)=0A=
{=0A=
- return (struct ffp_desc *)hash_table_get(fragment_shaders, =
settings);}=0A=
+ return (struct ffp_frag_desc *)hash_table_get(fragment_shaders, =
settings);}=0A=
=0A=
-void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc =
*desc) {=0A=
- struct ffp_settings *key =3D HeapAlloc(GetProcessHeap(), 0, =
sizeof(*key));=0A=
- /* Note that the key is the implementation independent part of the =
ffp_desc structure,=0A=
+void add_ffp_frag_shader(struct hash_table_t *shaders, struct =
ffp_frag_desc *desc) {=0A=
+ struct ffp_frag_settings *key =3D HeapAlloc(GetProcessHeap(), 0, =
sizeof(*key));=0A=
+ /* Note that the key is the implementation independent part of the =
ffp_frag_desc structure,=0A=
* whereas desc points to an extended structure with implementation =
specific parts.=0A=
* Make a copy of the key because hash_table_put takes ownership of =
it=0A=
*/=0A=
@@ -2121,8 +2121,8 @@ void sampler_texdim(DWORD state, =
IWineD3DStateBlockImpl *stateblock, WineD3DCont=0A=
}=0A=
#undef GLINFO_LOCATION=0A=
=0A=
-unsigned int ffp_program_key_hash(void *key) {=0A=
- struct ffp_settings *k =3D (struct ffp_settings *)key;=0A=
+unsigned int ffp_frag_program_key_hash(void *key) {=0A=
+ struct ffp_frag_settings *k =3D (struct ffp_frag_settings *)key;=0A=
unsigned int hash =3D 0, i;=0A=
DWORD *blob;=0A=
=0A=
@@ -2147,9 +2147,9 @@ unsigned int ffp_program_key_hash(void *key) {=0A=
return hash;=0A=
}=0A=
=0A=
-BOOL ffp_program_key_compare(void *keya, void *keyb) {=0A=
- struct ffp_settings *ka =3D (struct ffp_settings *)keya;=0A=
- struct ffp_settings *kb =3D (struct ffp_settings *)keyb;=0A=
+BOOL ffp_frag_program_key_compare(void *keya, void *keyb) {=0A=
+ struct ffp_frag_settings *ka =3D (struct ffp_frag_settings *)keya;=0A=
+ struct ffp_frag_settings *kb =3D (struct ffp_frag_settings *)keyb;=0A=
=0A=
return memcmp(ka, kb, sizeof(*ka)) =3D=3D 0;=0A=
}=0A=
diff --git a/dlls/wined3d/wined3d_private.h =
b/dlls/wined3d/wined3d_private.h=0A=
index 1ca1edd..ae7e3df 100644=0A=
--- a/dlls/wined3d/wined3d_private.h=0A=
+++ b/dlls/wined3d/wined3d_private.h=0A=
@@ -853,7 +853,7 @@ struct texture_stage_op=0A=
WINED3DFORMAT color_correction;=0A=
};=0A=
=0A=
-struct ffp_settings {=0A=
+struct ffp_frag_settings {=0A=
struct texture_stage_op op[MAX_TEXTURES];=0A=
enum {=0A=
FOG_OFF,=0A=
@@ -865,16 +865,16 @@ struct ffp_settings {=0A=
unsigned int sRGB_write;=0A=
};=0A=
=0A=
-struct ffp_desc=0A=
+struct ffp_frag_desc=0A=
{=0A=
- struct ffp_settings settings;=0A=
+ struct ffp_frag_settings settings;=0A=
};=0A=
=0A=
-void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings =
*settings, BOOL ignore_textype);=0A=
-struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, =
struct ffp_settings *settings);=0A=
-void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc =
*desc);=0A=
-BOOL ffp_program_key_compare(void *keya, void *keyb);=0A=
-unsigned int ffp_program_key_hash(void *key);=0A=
+void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct =
ffp_frag_settings *settings, BOOL ignore_textype);=0A=
+struct ffp_frag_desc *find_ffp_frag_shader(struct hash_table_t =
*fragment_shaders, struct ffp_frag_settings *settings);=0A=
+void add_ffp_frag_shader(struct hash_table_t *shaders, struct =
ffp_frag_desc *desc);=0A=
+BOOL ffp_frag_program_key_compare(void *keya, void *keyb);=0A=
+unsigned int ffp_frag_program_key_hash(void *key);=0A=
=0A=
=
/************************************************************************=
*****=0A=
* IWineD3D implementation structure=0A=
-- =0A=
1.5.6.4=0A=
=0A=
------=_NextPart_000_0025_01C94A69.B2B64140--
More information about the wine-patches
mailing list