ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Sweden-Number/dlls/d3d8/shader.c

1312 lines
48 KiB
C
Raw Normal View History

- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/*
* shaders implementation
*
* Copyright 2002 Raphael Junqueira
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Header files must not include config.h.
2003-04-12 02:06:42 +02:00
#include "config.h"
Fixed header dependencies to be fully compatible with the Windows headers (with help from Dimitrie O. Paun).
2003-09-06 01:08:26 +02:00
#include <math.h>
#include <stdarg.h>
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
#include "d3d8_private.h"
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/* Shader debugging - Change the following line to enable debugging of software
vertex shaders */
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
#if 0 /* Must not be 1 in cvs version */
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
# define VSTRACE(A) TRACE A
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
# define TRACE_VSVECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w)
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#else
# define VSTRACE(A)
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
# define TRACE_VSVECTOR(name)
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#endif
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
/**
* DirectX9 SDK download
* http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp
*
* Exploring D3DX
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/html/directx07162002.asp
*
* Using Vertex Shaders
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/html/directx02192001.asp
*
* Dx9 New
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/whatsnew.asp
*
* Dx9 Shaders
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/Shaders/VertexShader2_0/VertexShader2_0.asp
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/Shaders/VertexShader2_0/Instructions/Instructions.asp
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/programmingguide/GettingStarted/VertexDeclaration/VertexDeclaration.asp
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/Shaders/VertexShader3_0/VertexShader3_0.asp
*
* Dx9 D3DX
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/programmingguide/advancedtopics/VertexPipe/matrixstack/matrixstack.asp
*
* FVF
* http://msdn.microsoft.com/library/en-us/directx9_c/directx/graphics/programmingguide/GettingStarted/VertexFormats/vformats.asp
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
*
* NVIDIA: DX8 Vertex Shader to NV Vertex Program
* http://developer.nvidia.com/view.asp?IO=vstovp
*
* NVIDIA: Memory Management with VAR
* http://developer.nvidia.com/view.asp?IO=var_memory_management
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
*/
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
typedef void (*shader_fct_t)();
typedef struct SHADER_OPCODE {
CONST BYTE opcode;
const char* name;
CONST UINT num_params;
shader_fct_t soft_fct;
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
DWORD min_version;
DWORD max_version;
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
} SHADER_OPCODE;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
/*******************************
* vshader functions software VM
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
*/
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_add(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = s0->x + s1->x;
d->y = s0->y + s1->y;
d->z = s0->z + s1->z;
d->w = s0->w + s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing add: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_dp3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = d->y = d->z = d->w = s0->x * s1->x + s0->y * s1->y + s0->z * s1->z;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing dp3: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_dp4(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = d->y = d->z = d->w = s0->x * s1->x + s0->y * s1->y + s0->z * s1->z + s0->w * s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing dp4: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_dst(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
d->x = 1.0f;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->y = s0->y * s1->y;
d->z = s0->z;
d->w = s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing dst: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_expp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
float tmp_f = floorf(s0->w);
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
DWORD tmp_d = 0;
tmp_f = powf(2.0f, s0->w);
tmp_d = *((DWORD*) &tmp_f) & 0xFFFFFF00;
d->x = powf(2.0f, tmp_f);
d->y = s0->w - tmp_f;
d->z = *((float*) &tmp_d);
d->w = 1.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing exp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_lit(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = 1.0f;
d->y = (0.0f < s0->x) ? s0->x : 0.0f;
d->z = (0.0f < s0->x && 0.0f < s0->y) ? powf(s0->y, s0->w) : 0.0f;
d->w = 1.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing lit: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_logp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing logp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_mad(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1, D3DSHADERVECTOR* s2) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = s0->x * s1->x + s2->x;
d->y = s0->y * s1->y + s2->y;
d->z = s0->z * s1->z + s2->z;
d->w = s0->w * s1->w + s2->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing mad: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) s2=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, s2->x, s2->y, s2->z, s2->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_max(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = (s0->x >= s1->x) ? s0->x : s1->x;
d->y = (s0->y >= s1->y) ? s0->y : s1->y;
d->z = (s0->z >= s1->z) ? s0->z : s1->z;
d->w = (s0->w >= s1->w) ? s0->w : s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing max: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_min(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = (s0->x < s1->x) ? s0->x : s1->x;
d->y = (s0->y < s1->y) ? s0->y : s1->y;
d->z = (s0->z < s1->z) ? s0->z : s1->z;
d->w = (s0->w < s1->w) ? s0->w : s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing min: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_mov(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = s0->x;
d->y = s0->y;
d->z = s0->z;
d->w = s0->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing mov: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_mul(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = s0->x * s1->x;
d->y = s0->y * s1->y;
d->z = s0->z * s1->z;
d->w = s0->w * s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing mul: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
void vshader_nop(void) {
/* NOPPPP ahhh too easy ;) */
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_rcp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = d->y = d->z = d->w = (0.0f == s0->w) ? HUGE : 1.0f / s0->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing rcp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_rsq(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f == tmp_f) ? HUGE : ((1.0f != tmp_f) ? 1.0f / sqrtf(tmp_f) : 1.0f);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing rsq: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_sge(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
d->x = (s0->x >= s1->x) ? 1.0f : 0.0f;
d->y = (s0->y >= s1->y) ? 1.0f : 0.0f;
d->z = (s0->z >= s1->z) ? 1.0f : 0.0f;
d->w = (s0->w >= s1->w) ? 1.0f : 0.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing sge: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_slt(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
d->x = (s0->x < s1->x) ? 1.0f : 0.0f;
d->y = (s0->y < s1->y) ? 1.0f : 0.0f;
d->z = (s0->z < s1->z) ? 1.0f : 0.0f;
d->w = (s0->w < s1->w) ? 1.0f : 0.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing slt: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
void vshader_sub(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
d->x = s0->x - s1->x;
d->y = s0->y - s1->y;
d->z = s0->z - s1->z;
d->w = s0->w - s1->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing sub: s0=(%f, %f, %f, %f) s1=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, s1->x, s1->y, s1->z, s1->w, d->x, d->y, d->z, d->w));
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
/**
* Version 1.1 specific
*/
void vshader_exp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = d->y = d->z = d->w = powf(2.0f, s0->w);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing exp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_log(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing log: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_frc(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = s0->x - floorf(s0->x);
d->y = s0->y - floorf(s0->y);
d->z = 0.0f;
d->w = 1.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing frc: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
typedef FLOAT D3DMATRIX44[4][4];
typedef FLOAT D3DMATRIX43[4][3];
typedef FLOAT D3DMATRIX34[4][4];
typedef FLOAT D3DMATRIX33[4][3];
typedef FLOAT D3DMATRIX32[4][2];
void vshader_m4x4(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, /*D3DSHADERVECTOR* mat1*/ D3DMATRIX44 mat) {
/*
* BuGGY CODE: here only if cast not work for copy/paste
D3DSHADERVECTOR* mat2 = mat1 + 1;
D3DSHADERVECTOR* mat3 = mat1 + 2;
D3DSHADERVECTOR* mat4 = mat1 + 3;
d->x = mat1->x * s0->x + mat2->x * s0->y + mat3->x * s0->z + mat4->x * s0->w;
d->y = mat1->y * s0->x + mat2->y * s0->y + mat3->y * s0->z + mat4->y * s0->w;
d->z = mat1->z * s0->x + mat2->z * s0->y + mat3->z * s0->z + mat4->z * s0->w;
d->w = mat1->w * s0->x + mat2->w * s0->y + mat3->w * s0->z + mat4->w * s0->w;
*/
d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z + mat[0][3] * s0->w;
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w;
d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z + mat[3][3] * s0->w;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing m4x4(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
VSTRACE(("executing m4x4(2): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
VSTRACE(("executing m4x4(3): mat=(%f, %f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
VSTRACE(("executing m4x4(4): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[3][0], mat[3][1], mat[3][2], mat[3][3], s0->w, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_m4x3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX43 mat) {
d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z + mat[0][3] * s0->w;
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w;
d->w = 1.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing m4x3(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
VSTRACE(("executing m4x3(2): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
VSTRACE(("executing m4x3(3): mat=(%f, %f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
VSTRACE(("executing m4x3(4): (%f) (%f) \n", s0->w, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_m3x4(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX34 mat) {
d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z;
d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z;
d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing m3x4(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));
VSTRACE(("executing m3x4(2): mat=(%f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], s0->y, d->y));
VSTRACE(("executing m3x4(3): mat=(%f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], s0->z, d->z));
VSTRACE(("executing m3x4(4): mat=(%f, %f, %f) (%f) (%f) \n", mat[3][0], mat[3][1], mat[3][2], s0->w, d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_m3x3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX33 mat) {
d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[2][2] * s0->z;
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[2][2] * s0->z;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z;
d->w = 1.0f;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
VSTRACE(("executing m3x3(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));
VSTRACE(("executing m3x3(2): mat=(%f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], s0->y, d->y));
VSTRACE(("executing m3x3(3): mat=(%f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], s0->z, d->z));
VSTRACE(("executing m3x3(4): (%f) \n", d->w));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
void vshader_m3x2(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX32 mat) {
FIXME("check\n");
d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z;
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z;
d->z = 0.0f;
d->w = 1.0f;
}
/**
* Version 2.0 specific
*/
void vshader_lrp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1, D3DSHADERVECTOR* s2, D3DSHADERVECTOR* s3) {
d->x = s0->x * (s1->x - s2->x) + s2->x;
d->y = s0->y * (s1->y - s2->y) + s2->y;
d->z = s0->z * (s1->z - s2->z) + s2->z;
d->w = s0->w * (s1->w - s2->w) + s2->x;
}
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/**
* log, exp, frc, m*x* seems to be macros ins ... to see
*/
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
static CONST SHADER_OPCODE vshader_ins [] = {
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
{D3DSIO_NOP, "nop", 0, vshader_nop, 0, 0},
{D3DSIO_MOV, "mov", 2, vshader_mov, 0, 0},
{D3DSIO_ADD, "add", 3, vshader_add, 0, 0},
{D3DSIO_SUB, "sub", 3, vshader_sub, 0, 0},
{D3DSIO_MAD, "mad", 4, vshader_mad, 0, 0},
{D3DSIO_MUL, "mul", 3, vshader_mul, 0, 0},
{D3DSIO_RCP, "rcp", 2, vshader_rcp, 0, 0},
{D3DSIO_RSQ, "rsq", 2, vshader_rsq, 0, 0},
{D3DSIO_DP3, "dp3", 3, vshader_dp3, 0, 0},
{D3DSIO_DP4, "dp4", 3, vshader_dp4, 0, 0},
{D3DSIO_MIN, "min", 3, vshader_min, 0, 0},
{D3DSIO_MAX, "max", 3, vshader_max, 0, 0},
{D3DSIO_SLT, "slt", 3, vshader_slt, 0, 0},
{D3DSIO_SGE, "sge", 3, vshader_sge, 0, 0},
{D3DSIO_EXP, "exp", 2, vshader_exp, 0, 0},
{D3DSIO_LOG, "log", 2, vshader_log, 0, 0},
{D3DSIO_LIT, "lit", 2, vshader_lit, 0, 0},
{D3DSIO_DST, "dst", 3, vshader_dst, 0, 0},
{D3DSIO_LRP, "lrp", 5, vshader_lrp, 0, 0},
{D3DSIO_FRC, "frc", 2, vshader_frc, 0, 0},
{D3DSIO_M4x4, "m4x4", 3, vshader_m4x4, 0, 0},
{D3DSIO_M4x3, "m4x3", 3, vshader_m4x3, 0, 0},
{D3DSIO_M3x4, "m3x4", 3, vshader_m3x4, 0, 0},
{D3DSIO_M3x3, "m3x3", 3, vshader_m3x3, 0, 0},
{D3DSIO_M3x2, "m3x2", 3, vshader_m3x2, 0, 0},
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/** FIXME: use direct access so add the others opcodes as stubs */
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
{D3DSIO_EXPP, "expp", 2, vshader_expp, 0, 0},
{D3DSIO_LOGP, "logp", 2, vshader_logp, 0, 0},
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
{0, NULL, 0, NULL, 0, 0}
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
};
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
inline static const SHADER_OPCODE* vshader_program_get_opcode(const DWORD code) {
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
DWORD i = 0;
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
/** TODO: use dichotomic search */
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
while (NULL != vshader_ins[i].name) {
if ((code & D3DSI_OPCODE_MASK) == vshader_ins[i].opcode) {
return &vshader_ins[i];
}
++i;
}
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
return NULL;
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
inline static void vshader_program_dump_param(const DWORD param, int input) {
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" };
static const char swizzle_reg_chars[] = "xyzw";
DWORD reg = param & 0x00001FFF;
DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) TRACE("-");
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
switch (regtype << D3DSP_REGTYPE_SHIFT) {
case D3DSPR_TEMP:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("R[%lu]", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_INPUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("V[%lu]", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_CONST:
Add real support for VS1.1, ie make the relative addressing mode work.
2003-09-25 22:22:40 +02:00
TRACE("C[%s%lu]", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_ADDR: /*case D3DSPR_TEXTURE:*/
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("a[%lu]", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_RASTOUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("%s", rastout_reg_names[reg]);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_ATTROUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("oD[%lu]", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
case D3DSPR_TEXCRDOUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("oT[%lu]", reg);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
break;
default:
break;
}
if (!input) {
/** operand output */
if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
if (param & D3DSP_WRITEMASK_0) TRACE(".x");
if (param & D3DSP_WRITEMASK_1) TRACE(".y");
if (param & D3DSP_WRITEMASK_2) TRACE(".z");
if (param & D3DSP_WRITEMASK_3) TRACE(".w");
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
}
} else {
/** operand input */
DWORD swizzle = (param & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT;
DWORD swizzle_x = swizzle & 0x03;
DWORD swizzle_y = (swizzle >> 2) & 0x03;
DWORD swizzle_z = (swizzle >> 4) & 0x03;
DWORD swizzle_w = (swizzle >> 6) & 0x03;
/**
* swizzle bits fields:
* WWZZYYXX
*/
if ((D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) != swizzle) { /* ! D3DVS_NOSWIZZLE == 0xE4 << D3DVS_SWIZZLE_SHIFT */
if (swizzle_x == swizzle_y &&
swizzle_x == swizzle_z &&
swizzle_x == swizzle_w) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE(".%c", swizzle_reg_chars[swizzle_x]);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
} else {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE(".%c%c%c%c",
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
swizzle_reg_chars[swizzle_x],
swizzle_reg_chars[swizzle_y],
swizzle_reg_chars[swizzle_z],
swizzle_reg_chars[swizzle_w]);
}
}
}
}
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
inline static BOOL vshader_is_version_token(DWORD token) {
return 0xFFFE0000 == (token & 0xFFFE0000);
}
inline static BOOL vshader_is_comment_token(DWORD token) {
return D3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK);
}
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/**
* Function parser ...
*/
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
inline static VOID IDirect3DVertexShaderImpl_ParseProgram(IDirect3DVertexShaderImpl* vshader, CONST DWORD* pFunction) {
const DWORD* pToken = pFunction;
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
const SHADER_OPCODE* curOpcode = NULL;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
DWORD len = 0;
DWORD i;
if (NULL != pToken) {
while (D3DVS_END() != *pToken) {
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
if (vshader_is_version_token(*pToken)) { /** version */
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("vs.%lu.%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
++pToken;
++len;
continue;
}
if (vshader_is_comment_token(*pToken)) { /** comment */
DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
++pToken;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("comment[%ld] ;%s\n", comment_len, (char*)pToken);*/
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
pToken += comment_len;
len += comment_len + 1;
continue;
}
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
curOpcode = vshader_program_get_opcode(*pToken);
++pToken;
++len;
if (NULL == curOpcode) {
/* unkown current opcode ... */
while (*pToken & 0x80000000) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("unrecognized opcode: %08lx\n", *pToken);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
++pToken;
++len;
}
} else {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("%s ", curOpcode->name);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
if (curOpcode->num_params > 0) {
vshader_program_dump_param(*pToken, 0);
++pToken;
++len;
for (i = 1; i < curOpcode->num_params; ++i) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE(", ");
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
vshader_program_dump_param(*pToken, 1);
++pToken;
++len;
}
}
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("\n");
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
}
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
vshader->functionLength = (len + 1) * sizeof(DWORD);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
} else {
vshader->functionLength = 1; /* no Function defined use fixed function vertex processing */
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
/* copy the function ... because it will certainly be released by application */
if (NULL != pFunction) {
vshader->function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, vshader->functionLength);
memcpy(vshader->function, pFunction, vshader->functionLength);
} else {
vshader->function = NULL;
}
}
HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShader(IDirect3DDevice8Impl* This, CONST DWORD* pFunction, DWORD Usage, IDirect3DVertexShaderImpl** ppVertexShader) {
IDirect3DVertexShaderImpl* object;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexShaderImpl));
if (NULL == object) {
*ppVertexShader = NULL;
return D3DERR_OUTOFVIDEOMEMORY;
}
/*object->lpVtbl = &Direct3DVextexShader9_Vtbl;*/
object->device = This; /* FIXME: AddRef(This) */
object->ref = 1;
object->usage = Usage;
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
object->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VSHADERDATA8));
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
IDirect3DVertexShaderImpl_ParseProgram(object, pFunction);
*ppVertexShader = object;
return D3D_OK;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
BOOL IDirect3DVertexShaderImpl_ExecuteHAL(IDirect3DVertexShaderImpl* vshader, VSHADERINPUTDATA8* input, VSHADEROUTPUTDATA8* output) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/**
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
* TODO: use the NV_vertex_program (or 1_1) extension
* and specifics vendors (ARB_vertex_program??) variants for it
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
*/
return TRUE;
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
HRESULT WINAPI IDirect3DVertexShaderImpl_ExecuteSW(IDirect3DVertexShaderImpl* vshader, VSHADERINPUTDATA8* input, VSHADEROUTPUTDATA8* output) {
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/** Vertex Shader Temporary Registers */
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
D3DSHADERVECTOR R[12];
/*D3DSHADERSCALAR A0;*/
D3DSHADERVECTOR A[1];
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/** temporary Vector for modifier management */
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
D3DSHADERVECTOR d;
D3DSHADERVECTOR s[3];
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/** parser datas */
const DWORD* pToken = vshader->function;
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
const SHADER_OPCODE* curOpcode = NULL;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
/** functions parameters */
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
D3DSHADERVECTOR* p[4];
D3DSHADERVECTOR* p_send[4];
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
DWORD i;
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
/** init temporary register */
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
memset(R, 0, 12 * sizeof(D3DSHADERVECTOR));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
/* vshader_program_parse(vshader); */
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
#if 0 /* Must not be 1 in cvs */
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
TRACE("Input:\n");
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
TRACE_VSVECTOR(vshader->data->C[0]);
TRACE_VSVECTOR(vshader->data->C[1]);
TRACE_VSVECTOR(vshader->data->C[2]);
TRACE_VSVECTOR(vshader->data->C[3]);
TRACE_VSVECTOR(vshader->data->C[4]);
TRACE_VSVECTOR(vshader->data->C[5]);
TRACE_VSVECTOR(vshader->data->C[6]);
TRACE_VSVECTOR(vshader->data->C[7]);
TRACE_VSVECTOR(vshader->data->C[8]);
TRACE_VSVECTOR(vshader->data->C[64]);
TRACE_VSVECTOR(input->V[D3DVSDE_POSITION]);
TRACE_VSVECTOR(input->V[D3DVSDE_BLENDWEIGHT]);
TRACE_VSVECTOR(input->V[D3DVSDE_BLENDINDICES]);
TRACE_VSVECTOR(input->V[D3DVSDE_NORMAL]);
TRACE_VSVECTOR(input->V[D3DVSDE_PSIZE]);
TRACE_VSVECTOR(input->V[D3DVSDE_DIFFUSE]);
TRACE_VSVECTOR(input->V[D3DVSDE_SPECULAR]);
TRACE_VSVECTOR(input->V[D3DVSDE_TEXCOORD0]);
TRACE_VSVECTOR(input->V[D3DVSDE_TEXCOORD1]);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#endif
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
TRACE_VSVECTOR(vshader->data->C[64]);
- mor usefull debug functions debug_d3dusage and debug_d3ddevicetype - fix a crash in pixel shader parser (happened with unreal2) - currently desactive pixel shaders caps (with #define) while hw shaders code isn't merged - when we have a special debug channel for shader, use it ;) - fix again some stubs return value - more more readable traces now (principaly IDirect3D8 capacities check and surface locking code) using new debug functions - fix/cleaning the surface locking code - now we support D3DTOP_SUBSTRACT so declare it in caps - now support true 32bit (well X 24 bit can be used as 32 bit in caps code) - first try to get D3DTSS_TCI_CAMERASPACENORMAL and D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR look good - native support 32 bit support (now application can choose 16 or 32 bit support) if current resolution is 24 bit (as we can only launch games in windowed mode) - textures palettes support - fix reflexion placement code (the sdk sample begin to work) - fix a stupid crash when using traces in vshaderdeclaration - more more readable traces (init/caps) - more cubetextures fixes
2003-05-17 20:33:02 +02:00
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/* the first dword is the version tag */
/* TODO: parse it */
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
if (vshader_is_version_token(*pToken)) { /** version */
++pToken;
}
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
while (D3DVS_END() != *pToken) {
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
if (vshader_is_comment_token(*pToken)) { /** comment */
DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
++pToken;
pToken += comment_len;
continue ;
}
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
curOpcode = vshader_program_get_opcode(*pToken);
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
++pToken;
if (NULL == curOpcode) {
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
i = 0;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
/* unkown current opcode ... */
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
while (*pToken & 0x80000000) {
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
if (i == 0) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("unrecognized opcode: pos=%d token=%08lX\n", (pToken - 1) - vshader->function, *(pToken - 1));
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("unrecognized opcode param: pos=%d token=%08lX what=", pToken - vshader->function, *pToken);
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
vshader_program_dump_param(*pToken, i);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
TRACE("\n");
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
++i;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
++pToken;
}
/*return FALSE;*/
} else {
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
if (curOpcode->num_params > 0) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE(">> execting opcode: pos=%d opcode_name=%s token=%08lX\n", pToken - vshader->function, curOpcode->name, *pToken);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
for (i = 0; i < curOpcode->num_params; ++i) {
DWORD reg = pToken[i] & 0x00001FFF;
DWORD regtype = ((pToken[i] & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT);
switch (regtype << D3DSP_REGTYPE_SHIFT) {
case D3DSPR_TEMP:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d]=R[%d]\n", i, reg);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &R[reg];
break;
case D3DSPR_INPUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d]=V[%s]\n", i, VertexShaderDeclRegister[reg]);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &input->V[reg];
break;
case D3DSPR_CONST:
Add real support for VS1.1, ie make the relative addressing mode work.
2003-09-25 22:22:40 +02:00
if (pToken[i] & D3DVS_ADDRMODE_RELATIVE) {
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &vshader->data->C[(DWORD) A[0].x + reg];
} else {
p[i] = &vshader->data->C[reg];
}
break;
case D3DSPR_ADDR: /*case D3DSPR_TEXTURE:*/
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
if (0 != reg) {
ERR("cannot handle address registers != a0, forcing use of a0\n");
reg = 0;
}
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d]=A[%d]\n", i, reg);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &A[reg];
break;
case D3DSPR_RASTOUT:
switch (reg) {
case D3DSRO_POSITION:
p[i] = &output->oPos;
break;
case D3DSRO_FOG:
p[i] = &output->oFog;
break;
case D3DSRO_POINT_SIZE:
p[i] = &output->oPts;
break;
}
break;
case D3DSPR_ATTROUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d]=oD[%d]\n", i, reg);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &output->oD[reg];
break;
case D3DSPR_TEXCRDOUT:
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d]=oT[%d]\n", i, reg);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p[i] = &output->oT[reg];
break;
default:
break;
}
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
if (i > 0) { /* input reg */
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
DWORD swizzle = (pToken[i] & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
UINT isNegative = ((pToken[i] & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG);
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
if (!isNegative && (D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) == swizzle) {
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d] not swizzled\n", i);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p_send[i] = p[i];
} else {
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
DWORD swizzle_x = swizzle & 0x03;
DWORD swizzle_y = (swizzle >> 2) & 0x03;
DWORD swizzle_z = (swizzle >> 4) & 0x03;
DWORD swizzle_w = (swizzle >> 6) & 0x03;
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
/*TRACE("p[%d] swizzled\n", i);*/
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
float* tt = (float*) p[i];
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
s[i].x = (isNegative) ? -tt[swizzle_x] : tt[swizzle_x];
s[i].y = (isNegative) ? -tt[swizzle_y] : tt[swizzle_y];
s[i].z = (isNegative) ? -tt[swizzle_z] : tt[swizzle_z];
s[i].w = (isNegative) ? -tt[swizzle_w] : tt[swizzle_w];
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
p_send[i] = &s[i];
}
} else { /* output reg */
if ((pToken[i] & D3DSP_WRITEMASK_ALL) == D3DSP_WRITEMASK_ALL) {
p_send[i] = p[i];
} else {
p_send[i] = &d; /* to be post-processed for modifiers management */
}
}
}
}
switch (curOpcode->num_params) {
case 0:
curOpcode->soft_fct();
break;
case 1:
curOpcode->soft_fct(p_send[0]);
break;
case 2:
curOpcode->soft_fct(p_send[0], p_send[1]);
break;
case 3:
curOpcode->soft_fct(p_send[0], p_send[1], p_send[2]);
break;
case 4:
curOpcode->soft_fct(p_send[0], p_send[1], p_send[2], p_send[3]);
break;
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
case 5:
curOpcode->soft_fct(p_send[0], p_send[1], p_send[2], p_send[3], p_send[4]);
break;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
default:
ERR("%s too many params: %u\n", curOpcode->name, curOpcode->num_params);
}
/* check if output reg modifier post-process */
if (curOpcode->num_params > 0 && (pToken[0] & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) {
if (pToken[0] & D3DSP_WRITEMASK_0) p[0]->x = d.x;
if (pToken[0] & D3DSP_WRITEMASK_1) p[0]->y = d.y;
if (pToken[0] & D3DSP_WRITEMASK_2) p[0]->z = d.z;
if (pToken[0] & D3DSP_WRITEMASK_3) p[0]->w = d.w;
}
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#if 0
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
TRACE_VSVECTOR(output->oPos);
TRACE_VSVECTOR(output->oD[0]);
TRACE_VSVECTOR(output->oD[1]);
TRACE_VSVECTOR(output->oT[0]);
TRACE_VSVECTOR(output->oT[1]);
TRACE_VSVECTOR(R[0]);
TRACE_VSVECTOR(R[1]);
TRACE_VSVECTOR(R[2]);
TRACE_VSVECTOR(R[3]);
TRACE_VSVECTOR(R[4]);
TRACE_VSVECTOR(R[5]);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#endif
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
/* to next opcode token */
pToken += curOpcode->num_params;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#if 0
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
TRACE("End of current instruction:\n");
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
TRACE_VSVECTOR(output->oPos);
TRACE_VSVECTOR(output->oD[0]);
TRACE_VSVECTOR(output->oD[1]);
TRACE_VSVECTOR(output->oT[0]);
TRACE_VSVECTOR(output->oT[1]);
TRACE_VSVECTOR(R[0]);
TRACE_VSVECTOR(R[1]);
TRACE_VSVECTOR(R[2]);
TRACE_VSVECTOR(R[3]);
TRACE_VSVECTOR(R[4]);
TRACE_VSVECTOR(R[5]);
- Move texture loading into PreLoad for 2D textures (needs doing for the others as well), and call when needed as well. - Change D3DFMT_R5G6B5 handling to make backdrop of Max Payne appear. - Add code to reject attempts to use invalid texture units (Max Payne did this a lot). - ValidateDevice fixme silenced as harmless but occurs frequently. - Add trace which can be compiled in to debug vertex shaders, and correct fixmes and dprintf's into appropriate trace statements. - Ensure we trace what we return when querying the device caps. - Correct bug with negative numbers in vertex shader code.
2003-05-08 05:49:04 +02:00
#endif
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
#if 0 /* Must not be 1 in cvs */
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
TRACE("Output:\n");
Make the fixed function pipeline support multiple streams for created vertex shaders with no function supplied. Also split down draw primitive along the lines of the d3dcore requirements and put in some diagnostic aids.
2003-06-13 20:09:05 +02:00
TRACE_VSVECTOR(output->oPos);
TRACE_VSVECTOR(output->oD[0]);
TRACE_VSVECTOR(output->oD[1]);
TRACE_VSVECTOR(output->oT[0]);
TRACE_VSVECTOR(output->oT[1]);
- new debug channel for shaders code 'd3d_shader' - more debugging traces
2003-05-14 21:34:00 +02:00
#endif
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
return D3D_OK;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
HRESULT WINAPI IDirect3DVertexShaderImpl_GetFunction(IDirect3DVertexShaderImpl* This, VOID* pData, UINT* pSizeOfData) {
if (NULL == pData) {
*pSizeOfData = This->functionLength;
return D3D_OK;
}
if (*pSizeOfData < This->functionLength) {
*pSizeOfData = This->functionLength;
return D3DERR_MOREDATA;
}
if (NULL == This->function) { /* no function defined */
TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData);
(*(DWORD **) pData) = NULL;
} else {
TRACE("(%p) : GetFunction copying to %p\n", This, pData);
memcpy(pData, This->function, This->functionLength);
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
return D3D_OK;
- some fixes in CreateDevice init - vertex shader declaration parser (with output dump) and interpretation (generate the FVF descriptor for program input) - vertex shader program parser (with output dump) - software vertex shader program emulation
2002-12-18 06:05:41 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
HRESULT WINAPI IDirect3DVertexShaderImpl_SetConstantF(IDirect3DVertexShaderImpl* This, UINT StartRegister, CONST FLOAT* pConstantData, UINT Vector4fCount) {
if (StartRegister + Vector4fCount > D3D8_VSHADER_MAX_CONSTANTS) {
return D3DERR_INVALIDCALL;
}
if (NULL == This->data) { /* temporary while datas not supported */
FIXME("(%p) : VertexShader_SetConstant not fully supported yet\n", This);
return D3DERR_INVALIDCALL;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
memcpy(&This->data->C[StartRegister], pConstantData, Vector4fCount * 4 * sizeof(FLOAT));
return D3D_OK;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
HRESULT WINAPI IDirect3DVertexShaderImpl_GetConstantF(IDirect3DVertexShaderImpl* This, UINT StartRegister, FLOAT* pConstantData, UINT Vector4fCount) {
if (StartRegister + Vector4fCount > D3D8_VSHADER_MAX_CONSTANTS) {
return D3DERR_INVALIDCALL;
}
if (NULL == This->data) { /* temporary while datas not supported */
return D3DERR_INVALIDCALL;
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
Some needed cleanups for future dx9 and d3d common layer support: - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c) - shaders to IDirect3D*ShaderImpl interfaces - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use) - vshader declaration code to a new file (vsaderdeclaration.c) - device calls to new interfaces (redirect stubs) Simple texture fix for a little regression after last Jason's patches. Some caps code using the GL/glext.h defines (GL_VERSION_*).
2003-01-28 02:12:23 +01:00
memcpy(pConstantData, &This->data->C[StartRegister], Vector4fCount * 4 * sizeof(FLOAT));
return D3D_OK;
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
}
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
/**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************/
void pshader_texcoord(D3DSHADERVECTOR* d) {
}
void pshader_texkill(D3DSHADERVECTOR* d) {
}
void pshader_tex(D3DSHADERVECTOR* d) {
}
void pshader_texbem(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texbeml(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texreg2ar(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texreg2gb(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x2pad(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x2tex(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x3pad(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x3tex(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x3diff(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x3spec(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
}
void pshader_texm3x3vspec(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_cnd(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1, D3DSHADERVECTOR* s2) {
}
void pshader_def(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1, D3DSHADERVECTOR* s2, D3DSHADERVECTOR* s3) {
}
void pshader_texreg2rgb(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texdp3tex(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x2depth(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texdp3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texm3x3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
}
void pshader_texdepth(D3DSHADERVECTOR* d) {
}
void pshader_cmp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1, D3DSHADERVECTOR* s2) {
}
void pshader_bem(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DSHADERVECTOR* s1) {
}
static CONST SHADER_OPCODE pshader_ins [] = {
{D3DSIO_NOP, "nop", 0, vshader_nop, 0, 0},
{D3DSIO_MOV, "mov", 2, vshader_mov, 0, 0},
{D3DSIO_ADD, "add", 3, vshader_add, 0, 0},
{D3DSIO_SUB, "sub", 3, vshader_sub, 0, 0},
{D3DSIO_MAD, "mad", 4, vshader_mad, 0, 0},
{D3DSIO_MUL, "mul", 3, vshader_mul, 0, 0},
{D3DSIO_RCP, "rcp", 2, vshader_rcp, 0, 0},
{D3DSIO_RSQ, "rsq", 2, vshader_rsq, 0, 0},
{D3DSIO_DP3, "dp3", 3, vshader_dp3, 0, 0},
{D3DSIO_DP4, "dp4", 3, vshader_dp4, 0, 0},
{D3DSIO_MIN, "min", 3, vshader_min, 0, 0},
{D3DSIO_MAX, "max", 3, vshader_max, 0, 0},
{D3DSIO_SLT, "slt", 3, vshader_slt, 0, 0},
{D3DSIO_SGE, "sge", 3, vshader_sge, 0, 0},
{D3DSIO_EXP, "exp", 2, vshader_exp, 0, 0},
{D3DSIO_LOG, "log", 2, vshader_log, 0, 0},
{D3DSIO_LIT, "lit", 2, vshader_lit, 0, 0},
{D3DSIO_DST, "dst", 3, vshader_dst, 0, 0},
{D3DSIO_LRP, "lrp", 5, vshader_lrp, 0, 0},
{D3DSIO_FRC, "frc", 2, vshader_frc, 0, 0},
{D3DSIO_M4x4, "m4x4", 3, vshader_m4x4, 0, 0},
{D3DSIO_M4x3, "m4x3", 3, vshader_m4x3, 0, 0},
{D3DSIO_M3x4, "m3x4", 3, vshader_m3x4, 0, 0},
{D3DSIO_M3x3, "m3x3", 3, vshader_m3x3, 0, 0},
{D3DSIO_M3x2, "m3x2", 3, vshader_m3x2, 0, 0},
{D3DSIO_TEXCOORD, "texcoord", 1, pshader_texcoord, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXKILL, "texkill", 1, pshader_texkill, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEX, "tex", 1, pshader_tex, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)},
{D3DSIO_TEXBEM, "texbem", 2, pshader_texbem, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXBEML, "texbeml", 2, pshader_texbeml, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXREG2AR, "texreg2ar", 2, pshader_texreg2ar, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXREG2GB, "texreg2gb", 2, pshader_texreg2gb, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x2PAD, "texm3x2pad", 2, pshader_texm3x2pad, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x2TEX, "texm3x2tex", 2, pshader_texm3x2tex, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x3PAD, "texm3x3pad", 2, pshader_texm3x3pad, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x3TEX, "texm3x3tex", 2, pshader_texm3x3tex, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x3DIFF, "texm3x3diff", 2, pshader_texm3x3diff, D3DPS_VERSION(0,0), D3DPS_VERSION(0,0)},
{D3DSIO_TEXM3x3SPEC, "texm3x3spec", 3, pshader_texm3x3spec, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x3VSPEC, "texm3x3vspec", 2, pshader_texm3x3vspec, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},
{D3DSIO_EXPP, "expp", 2, vshader_expp, 0, 0},
{D3DSIO_LOGP, "logp", 2, vshader_logp, 0, 0},
{D3DSIO_CND, "cnd", 4, pshader_cnd, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)},
{D3DSIO_DEF, "def", 5, pshader_def, D3DPS_VERSION(1,1), D3DPS_VERSION(3,0)},
{D3DSIO_TEXREG2RGB, "texbreg2rgb", 2, pshader_texreg2rgb, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXDP3TEX, "texdp3tex", 2, pshader_texdp3tex, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x2DEPTH, "texm3x2depth", 2, pshader_texm3x2depth, D3DPS_VERSION(1,3), D3DPS_VERSION(1,3)},
{D3DSIO_TEXDP3, "texdp3", 2, pshader_texdp3, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXM3x3, "texm3x3", 2, pshader_texm3x3, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXDEPTH, "texdepth", 1, pshader_texdepth, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)},
{D3DSIO_CMP, "cmp", 4, pshader_cmp, D3DPS_VERSION(1,1), D3DPS_VERSION(3,0)},
{D3DSIO_BEM, "bem", 3, pshader_bem, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)},
{0, NULL, 0, NULL}
};
inline static const SHADER_OPCODE* pshader_program_get_opcode(const DWORD code) {
DWORD i = 0;
/** TODO: use dichotomic search */
while (NULL != pshader_ins[i].name) {
if ((code & D3DSI_OPCODE_MASK) == pshader_ins[i].opcode) {
return &pshader_ins[i];
}
++i;
}
return NULL;
}
inline static void pshader_program_dump_opcode(const SHADER_OPCODE* curOpcode, const DWORD code, const DWORD output) {
if (0 != (code & ~D3DSI_OPCODE_MASK)) {
DWORD mask = (code & ~D3DSI_OPCODE_MASK);
switch (mask) {
case 0x40000000: TRACE("+"); break;
default:
TRACE(" unhandled modifier(0x%08lx) ", mask);
}
}
TRACE("%s", curOpcode->name);
/**
* normally this is a destination reg modifier
* but in pixel shaders asm code its specified as:
* dp3_x4 t1.rgba, r1, c1
* or
* dp3_x2_sat r0, t0_bx2, v0_bx2
* so for better debbuging i use the same norm
*/
if (0 != (output & D3DSP_DSTSHIFT_MASK)) {
DWORD shift = (output & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT;
if (shift > 0) {
TRACE("_x%u", 1 << shift);
}
}
/**
* TODO: fix the divide shifts: d2, d4, d8
* so i have to find a sample
*/
if (0 != (output & D3DSP_DSTMOD_MASK)) {
DWORD mask = output & D3DSP_DSTMOD_MASK;
switch (mask) {
case D3DSPDM_SATURATE: TRACE("_sat"); break;
default:
TRACE("_unhandled_modifier(0x%08lx)", mask);
}
}
TRACE(" ");
}
inline static void pshader_program_dump_param(const DWORD param, int input) {
static const char* rastout_reg_names[] = { "oC0", "oC1", "oC2", "oC3", "oDepth" };
static const char swizzle_reg_chars[] = "rgba";
DWORD reg = param & 0x00001FFF;
DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT);
if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) {
TRACE("-");
}
switch (regtype << D3DSP_REGTYPE_SHIFT) {
case D3DSPR_TEMP:
TRACE("R[%lu]", reg);
break;
case D3DSPR_INPUT:
TRACE("V[%lu]", reg);
break;
case D3DSPR_CONST:
Add real support for VS1.1, ie make the relative addressing mode work.
2003-09-25 22:22:40 +02:00
TRACE("C[%s%lu]", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg);
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
break;
case D3DSPR_TEXTURE: /* case D3DSPR_ADDR: */
TRACE("t[%lu]", reg);
break;
case D3DSPR_RASTOUT:
TRACE("%s", rastout_reg_names[reg]);
break;
case D3DSPR_ATTROUT:
TRACE("oD[%lu]", reg);
break;
case D3DSPR_TEXCRDOUT:
TRACE("oT[%lu]", reg);
break;
default:
break;
}
if (!input) {
/** operand output */
/**
* for better debugging traces it's done into opcode dump code
* @see pshader_program_dump_opcode
if (0 != (param & D3DSP_DSTMOD_MASK)) {
DWORD mask = param & D3DSP_DSTMOD_MASK;
switch (mask) {
case D3DSPDM_SATURATE: TRACE("_sat"); break;
default:
TRACE("_unhandled_modifier(0x%08lx)", mask);
}
}
if (0 != (param & D3DSP_DSTSHIFT_MASK)) {
DWORD shift = (param & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT;
if (shift > 0) {
TRACE("_x%u", 1 << shift);
}
}
*/
if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) {
if (param & D3DSP_WRITEMASK_0) TRACE(".r");
if (param & D3DSP_WRITEMASK_1) TRACE(".g");
if (param & D3DSP_WRITEMASK_2) TRACE(".b");
if (param & D3DSP_WRITEMASK_3) TRACE(".a");
}
} else {
/** operand input */
DWORD swizzle = (param & D3DSP_SWIZZLE_MASK) >> D3DSP_SWIZZLE_SHIFT;
DWORD swizzle_x = swizzle & 0x03;
DWORD swizzle_y = (swizzle >> 2) & 0x03;
DWORD swizzle_z = (swizzle >> 4) & 0x03;
DWORD swizzle_w = (swizzle >> 6) & 0x03;
/**
* swizzle bits fields:
* WWZZYYXX
*/
if ((D3DSP_NOSWIZZLE >> D3DSP_SWIZZLE_SHIFT) != swizzle) { /* ! D3DVS_NOSWIZZLE == 0xE4 << D3DVS_SWIZZLE_SHIFT */
if (swizzle_x == swizzle_y &&
swizzle_x == swizzle_z &&
swizzle_x == swizzle_w) {
TRACE(".%c", swizzle_reg_chars[swizzle_x]);
} else {
TRACE(".%c%c%c%c",
swizzle_reg_chars[swizzle_x],
swizzle_reg_chars[swizzle_y],
swizzle_reg_chars[swizzle_z],
swizzle_reg_chars[swizzle_w]);
}
}
if (0 != (param & D3DSP_SRCMOD_MASK)) {
DWORD mask = param & D3DSP_SRCMOD_MASK;
/*TRACE("_modifier(0x%08lx) ", mask);*/
switch (mask) {
case D3DSPSM_NONE: break;
case D3DSPSM_NEG: break;
case D3DSPSM_BIAS: TRACE("_bias"); break;
case D3DSPSM_BIASNEG: TRACE("_bias"); break;
case D3DSPSM_SIGN: TRACE("_sign"); break;
case D3DSPSM_SIGNNEG: TRACE("_sign"); break;
case D3DSPSM_COMP: TRACE("_comp"); break;
case D3DSPSM_X2: TRACE("_x2"); break;
case D3DSPSM_X2NEG: TRACE("_bx2"); break;
case D3DSPSM_DZ: TRACE("_dz"); break;
case D3DSPSM_DW: TRACE("_dw"); break;
default:
TRACE("_unknown(0x%08lx)", mask);
}
}
}
}
inline static BOOL pshader_is_version_token(DWORD token) {
return 0xFFFF0000 == (token & 0xFFFF0000);
}
inline static BOOL pshader_is_comment_token(DWORD token) {
return D3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK);
}
/**
* Pixel Shaders
*
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/Shaders/PixelShader1_X/modifiers/sourceregistermodifiers.asp
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/Shaders/PixelShader2_0/Registers/Registers.asp
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/IDirect3DPixelShader9/_IDirect3DPixelShader9.asp
*
*/
inline static VOID IDirect3DPixelShaderImpl_ParseProgram(IDirect3DPixelShaderImpl* pshader, CONST DWORD* pFunction) {
const DWORD* pToken = pFunction;
const SHADER_OPCODE* curOpcode = NULL;
DWORD code;
DWORD len = 0;
DWORD i;
if (NULL != pToken) {
while (D3DPS_END() != *pToken) {
if (pshader_is_version_token(*pToken)) { /** version */
TRACE("ps.%lu.%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F));
++pToken;
++len;
continue;
}
if (pshader_is_comment_token(*pToken)) { /** comment */
DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
++pToken;
/*TRACE("comment[%ld] ;%s\n", comment_len, (char*)pToken);*/
pToken += comment_len;
len += comment_len + 1;
continue;
}
code = *pToken;
curOpcode = pshader_program_get_opcode(code);
++pToken;
++len;
if (NULL == curOpcode) {
/* unkown current opcode ... */
while (*pToken & 0x80000000) {
TRACE("unrecognized opcode: %08lx\n", *pToken);
++pToken;
++len;
}
} else {
TRACE(" ");
pshader_program_dump_opcode(curOpcode, code, *pToken);
if (curOpcode->num_params > 0) {
pshader_program_dump_param(*pToken, 0);
++pToken;
++len;
for (i = 1; i < curOpcode->num_params; ++i) {
TRACE(", ");
if (D3DSIO_DEF != code) {
pshader_program_dump_param(*pToken, 1);
} else {
TRACE("%f", *((float*) pToken));
}
++pToken;
++len;
}
}
TRACE("\n");
}
pshader->functionLength = (len + 1) * sizeof(DWORD);
}
} else {
pshader->functionLength = 1; /* no Function defined use fixed function vertex processing */
}
if (NULL != pFunction) {
pshader->function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pshader->functionLength);
memcpy(pshader->function, pFunction, pshader->functionLength);
} else {
pshader->function = NULL;
}
}
HRESULT WINAPI IDirect3DDeviceImpl_CreatePixelShader(IDirect3DDevice8Impl* This, CONST DWORD* pFunction, IDirect3DPixelShaderImpl** ppPixelShader) {
IDirect3DPixelShaderImpl* object;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DPixelShaderImpl));
if (NULL == object) {
*ppPixelShader = NULL;
return D3DERR_OUTOFVIDEOMEMORY;
}
/*object->lpVtbl = &Direct3DPixelShader9_Vtbl;*/
object->device = This;
object->ref = 1;
object->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PSHADERDATA8));
IDirect3DPixelShaderImpl_ParseProgram(object, pFunction);
*ppPixelShader = object;
return D3D_OK;
}
HRESULT WINAPI IDirect3DPixelShaderImpl_GetFunction(IDirect3DPixelShaderImpl* This, VOID* pData, UINT* pSizeOfData) {
if (NULL == pData) {
*pSizeOfData = This->functionLength;
return D3D_OK;
}
if (*pSizeOfData < This->functionLength) {
*pSizeOfData = This->functionLength;
return D3DERR_MOREDATA;
}
if (NULL == This->function) { /* no function defined */
TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData);
(*(DWORD **) pData) = NULL;
} else {
TRACE("(%p) : GetFunction copying to %p\n", This, pData);
memcpy(pData, This->function, This->functionLength);
}
return D3D_OK;
}
HRESULT WINAPI IDirect3DPixelShaderImpl_SetConstantF(IDirect3DPixelShaderImpl* This, UINT StartRegister, CONST FLOAT* pConstantData, UINT Vector4fCount) {
if (StartRegister + Vector4fCount > D3D8_VSHADER_MAX_CONSTANTS) {
return D3DERR_INVALIDCALL;
}
if (NULL == This->data) { /* temporary while datas not supported */
FIXME("(%p) : VertexShader_SetConstant not fully supported yet\n", This);
return D3DERR_INVALIDCALL;
}
memcpy(&This->data->C[StartRegister], pConstantData, Vector4fCount * 4 * sizeof(FLOAT));
return D3D_OK;
}
HRESULT WINAPI IDirect3DPixelShaderImpl_GetConstantF(IDirect3DPixelShaderImpl* This, UINT StartRegister, FLOAT* pConstantData, UINT Vector4fCount) {
if (StartRegister + Vector4fCount > D3D8_VSHADER_MAX_CONSTANTS) {
return D3DERR_INVALIDCALL;
}
if (NULL == This->data) { /* temporary while datas not supported */
return D3DERR_INVALIDCALL;
}
memcpy(pConstantData, &This->data->C[StartRegister], Vector4fCount * 4 * sizeof(FLOAT));
return D3D_OK;
}
/**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************
**********************************************************************************************************************************************/
Fixed some issues found by winapi_check.
2003-01-02 20:28:09 +01:00
/***********************************************************************
* ValidateVertexShader (D3D8.@)
*/
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
BOOL WINAPI ValidateVertexShader(LPVOID what, LPVOID toto) {
- move input and output data in VertexShader struct - better traces - specific input data filling function for vertex shaders using vertex shader declaration (and not FVF ... maybe FVF will return for fast path with simples vertex shader declarations) - huge vertex shader fixes: - add and fix many vs (1.0->2.0) used opcodes in complex shaders - improvements to programs parser: parse comments, version, .. - add a vertex shader input filler function (parsing vertex shader declaration): almost complete - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-14 21:29:33 +01:00
FIXME("(void): stub: %p %p\n", what, toto);
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
return TRUE;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}
Fixed some issues found by winapi_check.
2003-01-02 20:28:09 +01:00
/***********************************************************************
* ValidatePixelShader (D3D8.@)
*/
- pixel shader program dump code - pixel shader code split into a new "COM object" (as done before for vertex shader) - some fixes on Validate* functions call types - add pixel shader (ie fragment_program) detection on caps code
2003-06-05 00:45:57 +02:00
BOOL WINAPI ValidatePixelShader(LPVOID what, LPVOID toto) {
FIXME("(void): stub: %p %p\n", what, toto);
- integration with DrawPrimitive - remove non-esthetic c++ comments into c comments block ;) - more more debug - indent, cleanups - trying to use DIFFUSE and SPECULAR for vertex shader - many fixes - integration with Jason's texture patch
2003-01-02 18:59:01 +01:00
return TRUE;
- some D3D8 fixes - beginning of shaders support (Vertex and Pixel Shaders 1.1 on DirectX8) - beginning of D3DX8 support the D3D8 utility API (very basic, only the core header)
2002-12-17 02:15:15 +01:00
}