From 93b3106be2cd7e62e59e59fe28308efbdf9d6379 Mon Sep 17 00:00:00 2001 From: Ivan Gyurdiev Date: Tue, 24 Oct 2006 06:04:12 -0400 Subject: [PATCH] wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace. --- dlls/wined3d/vertexshader.c | 6 +++--- dlls/wined3d/wined3d_private_types.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d48be441a7f..1b84c000324 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -942,13 +942,13 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ExecuteSW(IWineD3DVertexShader* iface, W break; case WINED3DSPR_RASTOUT: switch (reg) { - case D3DSRO_POSITION: + case WINED3DSRO_POSITION: p[i] = &output->oPos; break; - case D3DSRO_FOG: + case WINED3DSRO_FOG: p[i] = &output->oFog; break; - case D3DSRO_POINT_SIZE: + case WINED3DSRO_POINT_SIZE: p[i] = &output->oPts; break; } diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 2466fa51809..f02e980d9bb 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -80,6 +80,15 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { WINED3DSPR_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_REGISTER_TYPE; +/* RASTOUT register offsets */ +typedef enum _WINED3DVS_RASTOUT_OFFSETS { + WINED3DSRO_POSITION = 0, + WINED3DSRO_FOG = 1, + WINED3DSRO_POINT_SIZE = 2, + + WINED3DSRO_FORCE_DWORD = 0x7FFFFFFF +} WINED3DVS_RASTOUT_OFFSETS; + /** Source register modifiers **/ #define WINED3DVS_SWIZZLE_SHIFT 16 #define WINED3DVS_SWIZZLE_MASK (0xFF << WINED3DVS_SWIZZLE_SHIFT)