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

4089 lines
162 KiB
C
Raw Normal View History

Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/*
* IDirect3DDevice8 implementation
*
* Copyright 2002 Jason Edmeades
*
* 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
*/
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
#include "config.h"
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
#include <math.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 <stdarg.h>
Define NONAMELESS{STRUCT,UNION} explicitly in the files that need them.
2003-01-07 21:36:20 +01:00
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
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
/** define GL_GLEXT_PROTOTYPES for having extensions prototypes defined */
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
/*#define GL_GLEXT_PROTOTYPES*/
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
/*#undef GLX_GLXEXT_LEGACY*/
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
#include "d3d8_private.h"
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
/** currently desactiving 1_4 support as mesa doesn't implement all 1_4 support while defining it */
#undef GL_VERSION_1_4
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
WINE_DECLARE_DEBUG_CHANNEL(d3d_shader);
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
WINE_DECLARE_DEBUG_CHANNEL(fps);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
IDirect3DVertexShaderImpl* VertexShaders[64];
IDirect3DVertexShaderDeclarationImpl* VertexShaderDeclarations[64];
IDirect3DPixelShaderImpl* PixelShaders[64];
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* Debugging aids: */
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
#ifdef FRAME_DEBUGGING
BOOL isOn = FALSE;
BOOL isDumpingFrames = FALSE;
LONG primCounter = 0;
- Use faster vertex arrays (rather than processing vertexes one by one), whenever possible. - Less trace in the slower form by default.
2003-01-03 22:25:42 +01:00
#endif
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/*
* Utility functions or macros
*/
- Use faster vertex arrays (rather than processing vertexes one by one), whenever possible. - Less trace in the slower form by default.
2003-01-03 22:25:42 +01:00
#define conv_mat(mat,gl_mat) \
do { \
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("%f %f %f %f\n", (mat)->u.s._11, (mat)->u.s._12, (mat)->u.s._13, (mat)->u.s._14); \
TRACE("%f %f %f %f\n", (mat)->u.s._21, (mat)->u.s._22, (mat)->u.s._23, (mat)->u.s._24); \
TRACE("%f %f %f %f\n", (mat)->u.s._31, (mat)->u.s._32, (mat)->u.s._33, (mat)->u.s._34); \
TRACE("%f %f %f %f\n", (mat)->u.s._41, (mat)->u.s._42, (mat)->u.s._43, (mat)->u.s._44); \
- Use faster vertex arrays (rather than processing vertexes one by one), whenever possible. - Less trace in the slower form by default.
2003-01-03 22:25:42 +01:00
memcpy(gl_mat, (mat), 16 * sizeof(float)); \
} while (0)
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/* Apply the current values to the specified texture stage */
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
void setupTextureStates(LPDIRECT3DDEVICE8 iface, DWORD Stage, DWORD Flags) {
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
int i = 0;
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
float col[4];
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
BOOL changeTexture = TRUE;
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
TRACE("-----------------------> Updating the texture at stage %ld to have new texture state information\n", Stage);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
for (i = 1; i < HIGHEST_TEXTURE_STATE; i++) {
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
BOOL skip = FALSE;
switch (i) {
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
/* Performance: For texture states where multiples effect the outcome, only bother
applying the last one as it will pick up all the other values */
case D3DTSS_COLORARG0: /* Will be picked up when setting color op */
case D3DTSS_COLORARG1: /* Will be picked up when setting color op */
case D3DTSS_COLORARG2: /* Will be picked up when setting color op */
case D3DTSS_ALPHAARG0: /* Will be picked up when setting alpha op */
case D3DTSS_ALPHAARG1: /* Will be picked up when setting alpha op */
case D3DTSS_ALPHAARG2: /* Will be picked up when setting alpha op */
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
skip = TRUE;
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
break;
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
/* Performance: If the texture states only impact settings for the texture unit
(compared to the texture object) then there is no need to reapply them. The
only time they need applying is the first time, since we cheat and put the
values into the stateblock without applying.
Per-texture unit: texture function (eg. combine), ops and args
texture env color
texture generation settings
Note: Due to some special conditions there may be a need to do particular ones
of these, which is what the Flags allows */
case D3DTSS_COLOROP:
case D3DTSS_TEXCOORDINDEX:
if (!(Flags == REAPPLY_ALL)) skip=TRUE;
break;
case D3DTSS_ALPHAOP:
if (!(Flags & REAPPLY_ALPHAOP)) skip=TRUE;
break;
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
default:
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
skip = FALSE;
}
if (skip == FALSE) {
/* Performance: Only change to this texture if we have to */
if (changeTexture) {
/* Make appropriate texture active */
if (GL_SUPPORT(ARB_MULTITEXTURE)) {
#if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + Stage);
#else
glActiveTextureARB(GL_TEXTURE0_ARB + Stage);
#endif
checkGLcall("glActiveTextureARB");
} else if (Stage > 0) {
FIXME("Program using multiple concurrent textures which this opengl implementation doesnt support\n");
}
changeTexture = FALSE;
}
/* Now apply the change */
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
IDirect3DDevice8Impl_SetTextureStageState(iface, Stage, i, This->StateBlock->texture_state[Stage][i]);
}
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
}
/* Note the D3DRS value applies to all textures, but GL has one
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
* per texture, so apply it now ready to be used!
*/
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DCOLORTOGLFLOAT4(This->StateBlock->renderstate[D3DRS_TEXTUREFACTOR], col);
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]);
checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);");
TRACE("-----------------------> Updated the texture at stage %ld to have new texture state information\n", Stage);
}
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* Setup this textures matrix */
static void set_texture_matrix(float *smat, DWORD flags)
{
float mat[16];
glMatrixMode(GL_TEXTURE);
if (flags == D3DTTFF_DISABLE) {
glLoadIdentity();
checkGLcall("glLoadIdentity()");
return;
}
if (flags == (D3DTTFF_COUNT1|D3DTTFF_PROJECTED)) {
ERR("Invalid texture transform flags: D3DTTFF_COUNT1|D3DTTFF_PROJECTED\n");
checkGLcall("glLoadIdentity()");
return;
}
memcpy(mat, smat, 16*sizeof(float));
switch (flags & ~D3DTTFF_PROJECTED) {
case D3DTTFF_COUNT1: mat[1] = mat[5] = mat[9] = mat[13] = 0;
case D3DTTFF_COUNT2: mat[2] = mat[6] = mat[10] = mat[14] = 0;
default: mat[3] = mat[7] = mat[11] = 0, mat[15] = 1;
}
if (flags & D3DTTFF_PROJECTED) switch (flags & ~D3DTTFF_PROJECTED) {
case D3DTTFF_COUNT2:
mat[3] = mat[1], mat[7] = mat[5], mat[11] = mat[9], mat[15] = mat[13];
mat[1] = mat[5] = mat[9] = mat[13] = 0;
break;
case D3DTTFF_COUNT3:
mat[3] = mat[2], mat[7] = mat[6], mat[11] = mat[10], mat[15] = mat[14];
mat[2] = mat[6] = mat[10] = mat[14] = 0;
break;
}
glLoadMatrixf(mat);
checkGLcall("glLoadMatrixf(mat)");
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* IDirect3D IUnknown parts follow: */
HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj)
{
ICOM_THIS(IDirect3DDevice8Impl,iface);
if (IsEqualGUID(riid, &IID_IUnknown)
- 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
|| IsEqualGUID(riid, &IID_IDirect3DDevice8)) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DDevice8Impl_AddRef(iface);
*ppobj = This;
return D3D_OK;
}
WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
}
ULONG WINAPI IDirect3DDevice8Impl_AddRef(LPDIRECT3DDEVICE8 iface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref);
}
ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DDevice8Impl_CleanRender(iface);
HeapFree(GetProcessHeap(), 0, This);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
return ref;
}
/* IDirect3DDevice Interface follow: */
HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(LPDIRECT3DDEVICE8 iface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : stub\n", This); /* No way of notifying yet! */
return D3D_OK;
}
UINT WINAPI IDirect3DDevice8Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE8 iface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : stub, emulating 32Mb for now\n", This);
/*
* pretend we have 32MB of any type of memory queried.
*/
return (1024*1024*32);
}
HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(LPDIRECT3DDEVICE8 iface, DWORD Bytes) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(LPDIRECT3DDEVICE8 iface, IDirect3D8** ppD3D8) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : returning %p\n", This, This->direct3d8);
/* Inc ref count */
IDirect3D8_AddRef((LPDIRECT3D8) This->direct3d8);
*ppD3D8 = (IDirect3D8 *)This->direct3d8;
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface, D3DCAPS8* pCaps) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub, calling idirect3d for now\n", This);
IDirect3D8Impl_GetDeviceCaps((LPDIRECT3D8) This->direct3d8, This->adapterNo, This->devType, pCaps);
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(LPDIRECT3DDEVICE8 iface, D3DDISPLAYMODE* pMode) {
HDC hdc;
int bpp = 0;
ICOM_THIS(IDirect3DDevice8Impl,iface);
pMode->Width = GetSystemMetrics(SM_CXSCREEN);
pMode->Height = GetSystemMetrics(SM_CYSCREEN);
pMode->RefreshRate = 85; /*FIXME: How to identify? */
hdc = CreateDCA("DISPLAY", NULL, NULL, NULL);
bpp = GetDeviceCaps(hdc, BITSPIXEL);
DeleteDC(hdc);
switch (bpp) {
case 8: pMode->Format = D3DFMT_R8G8B8; break;
case 16: pMode->Format = D3DFMT_R5G6B5; break;
- 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
case 24: /*pMode->Format = D3DFMT_R8G8B8; break; */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case 32: pMode->Format = D3DFMT_A8R8G8B8; break;
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
default:
FIXME("Unrecognized display mode format\n");
pMode->Format = D3DFMT_UNKNOWN;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- 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
FIXME("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate,
pMode->Format, debug_d3dformat(pMode->Format));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
Various fixes, typos corrected and clarifying trace points.
2002-10-07 20:24:28 +02:00
TRACE("(%p) copying to %p\n", This, pParameters);
memcpy(pParameters, &This->CreateParms, sizeof(D3DDEVICE_CREATION_PARAMETERS));
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface8* pCursorBitmap) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DSurface8Impl* pSur = (IDirect3DSurface8Impl*) pCursorBitmap;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot);
if (D3DFMT_A8R8G8B8 != pSur->myDesc.Format) {
ERR("(%p) : surface(%p) have a invalid format\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
if (32 != pSur->myDesc.Height || 32 != pSur->myDesc.Width) {
ERR("(%p) : surface(%p) have a invalid size\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
This->xHotSpot = XHotSpot;
This->yHotSpot = YHotSpot;
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 iface, UINT XScreenSpace, UINT YScreenSpace, DWORD Flags) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) : SetPos to (%u,%u)\n", This, XScreenSpace, YScreenSpace);
This->xScreenSpace = XScreenSpace;
This->yScreenSpace = YScreenSpace;
return;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
BOOL WINAPI IDirect3DDevice8Impl_ShowCursor(LPDIRECT3DDEVICE8 iface, BOOL bShow) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) : visible(%d)\n", This, bShow);
This->bCursorVisible = bShow;
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain8** pSwapChain) {
- some cleanup and warning fixes - split of CreateDevice gl/gxl detection code into FillGLCaps - implementation of resolution change (using ChangeDisplaySettings) but desactived as ChangeDisplaySettings don't seem to work well - begin of swap chain support (now need to split/clean gxlpbuffer/glxpixmap code for swap chain use)
2003-06-05 00:55:19 +02:00
IDirect3DSwapChain8Impl* object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
FIXME("(%p) : stub\n", This);
- some cleanup and warning fixes - split of CreateDevice gl/gxl detection code into FillGLCaps - implementation of resolution change (using ChangeDisplaySettings) but desactived as ChangeDisplaySettings don't seem to work well - begin of swap chain support (now need to split/clean gxlpbuffer/glxpixmap code for swap chain use)
2003-06-05 00:55:19 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DDevice8Impl));
if (NULL == object) {
return D3DERR_OUTOFVIDEOMEMORY;
}
object->lpVtbl = &Direct3DSwapChain8_Vtbl;
object->ref = 1;
TRACE("(%p)->(DepthStencil:(%u,%s), BackBufferFormat:(%u,%s))\n", This,
pPresentationParameters->AutoDepthStencilFormat, debug_d3dformat(pPresentationParameters->AutoDepthStencilFormat),
pPresentationParameters->BackBufferFormat, debug_d3dformat(pPresentationParameters->BackBufferFormat));
if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) ||
(pPresentationParameters->BackBufferHeight == 0))) {
RECT Rect;
GetClientRect(This->win_handle, &Rect);
if (pPresentationParameters->BackBufferWidth == 0) {
pPresentationParameters->BackBufferWidth = Rect.right;
TRACE("Updating width to %d\n", pPresentationParameters->BackBufferWidth);
}
if (pPresentationParameters->BackBufferHeight == 0) {
pPresentationParameters->BackBufferHeight = Rect.bottom;
TRACE("Updating height to %d\n", pPresentationParameters->BackBufferHeight);
}
}
/* Save the presentation parms now filled in correctly */
memcpy(&object->PresentParms, pPresentationParameters, sizeof(D3DPRESENT_PARAMETERS));
IDirect3DDevice8Impl_CreateRenderTarget((LPDIRECT3DDEVICE8) object,
pPresentationParameters->BackBufferWidth,
pPresentationParameters->BackBufferHeight,
pPresentationParameters->BackBufferFormat,
pPresentationParameters->MultiSampleType,
TRUE,
(LPDIRECT3DSURFACE8*) &object->frontBuffer);
IDirect3DDevice8Impl_CreateRenderTarget((LPDIRECT3DDEVICE8) object,
pPresentationParameters->BackBufferWidth,
pPresentationParameters->BackBufferHeight,
pPresentationParameters->BackBufferFormat,
pPresentationParameters->MultiSampleType,
TRUE,
(LPDIRECT3DSURFACE8*) &object->backBuffer);
if (pPresentationParameters->EnableAutoDepthStencil) {
IDirect3DDevice8Impl_CreateDepthStencilSurface((LPDIRECT3DDEVICE8) object,
pPresentationParameters->BackBufferWidth,
pPresentationParameters->BackBufferHeight,
pPresentationParameters->AutoDepthStencilFormat,
D3DMULTISAMPLE_NONE,
(LPDIRECT3DSURFACE8*) &object->depthStencilBuffer);
} else {
object->depthStencilBuffer = NULL;
}
*pSwapChain = (IDirect3DSwapChain8*) object;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_Present(LPDIRECT3DDEVICE8 iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : complete stub!\n", This);
ENTER_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
glXSwapBuffers(This->display, This->drawable);
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
/* Dont call checkGLcall, as glGetError is not applicable here */
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("glXSwapBuffers called, Starting new frame\n");
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* FPS support */
if (TRACE_ON(fps))
{
static long prev_time, frames;
DWORD time = GetTickCount();
frames++;
/* every 1.5 seconds */
if (time - prev_time > 1500) {
TRACE_(fps)("@@@ %.2ffps\n", 1000.0*frames/(time - prev_time));
prev_time = time;
frames = 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
#if defined(FRAME_DEBUGGING)
{
if (GetFileAttributesA("C:\\D3DTRACE") != INVALID_FILE_ATTRIBUTES) {
if (!isOn) {
isOn = TRUE;
FIXME("Enabling D3D Trace\n");
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_d3d, 1);
#if defined(SHOW_FRAME_MAKEUP)
FIXME("Singe Frame snapshots Starting\n");
isDumpingFrames = TRUE;
glClear(GL_COLOR_BUFFER_BIT);
#endif
#if defined(SINGLE_FRAME_DEBUGGING)
} else {
#if defined(SHOW_FRAME_MAKEUP)
FIXME("Singe Frame snapshots Finishing\n");
isDumpingFrames = FALSE;
#endif
FIXME("Singe Frame trace complete\n");
DeleteFileA("C:\\D3DTRACE");
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_d3d, 0);
#endif
}
} else {
if (isOn) {
isOn = FALSE;
#if defined(SHOW_FRAME_MAKEUP)
FIXME("Singe Frame snapshots Finishing\n");
isDumpingFrames = FALSE;
#endif
FIXME("Disabling D3D Trace\n");
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_d3d, 0);
}
}
}
#endif
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
LEAVE_GL();
return D3D_OK;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface, UINT BackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8** ppBackBuffer) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
*ppBackBuffer = (LPDIRECT3DSURFACE8) This->backBuffer;
TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, BackBuffer, Type, *ppBackBuffer);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
if (BackBuffer > This->PresentParms.BackBufferCount - 1) {
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
FIXME("Only one backBuffer currently supported\n");
return D3DERR_INVALIDCALL;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Note inc ref on returned surface */
IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) *ppBackBuffer);
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(LPDIRECT3DDEVICE8 iface, D3DRASTER_STATUS* pRasterStatus) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
FIXME("(%p) : stub\n", This);
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) {
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
HDC hDC;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
FIXME("(%p) : pRamp@%p\n", This, pRamp);
hDC = GetDC(This->win_handle);
SetDeviceGammaRamp(hDC, (LPVOID) pRamp);
ReleaseDC(This->win_handle, hDC);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
return;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) {
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
HDC hDC;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
FIXME("(%p) : pRamp@%p\n", This, pRamp);
hDC = GetDC(This->win_handle);
GetDeviceGammaRamp(hDC, pRamp);
ReleaseDC(This->win_handle, hDC);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
return;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage,
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture8** ppTexture) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DTexture8Impl *object;
int i;
UINT tmpW;
UINT tmpH;
ICOM_THIS(IDirect3DDevice8Impl,iface);
/* Allocate the storage for the device */
- 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
TRACE("(%p) : W(%d) H(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, debug_d3dformat(Format), Pool);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture8Impl));
object->lpVtbl = &Direct3DTexture8_Vtbl;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
object->Device = This;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->ResourceType = D3DRTYPE_TEXTURE;
object->ref = 1;
object->width = Width;
object->height = Height;
object->levels = Levels;
object->usage = Usage;
object->format = Format;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Calculate levels for mip mapping */
if (Levels == 0) {
object->levels++;
tmpW = Width;
tmpH = Height;
while (tmpW > 1 && tmpH > 1) {
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
tmpW = max(1, tmpW / 2);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
tmpH = max(1, tmpH / 2);
object->levels++;
}
TRACE("Calculated levels = %d\n", object->levels);
}
/* Generate all the surfaces */
tmpW = Width;
tmpH = Height;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
for (i = 0; i < object->levels; i++)
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
{
IDirect3DDevice8Impl_CreateImageSurface(iface, tmpW, tmpH, Format, (LPDIRECT3DSURFACE8*) &object->surfaces[i]);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->surfaces[i]->Container = (IUnknown*) object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->surfaces[i]->myDesc.Usage = Usage;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
object->surfaces[i]->myDesc.Pool = Pool;
/**
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
* As written in msdn in IDirect3DTexture8::LockRect
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
* Textures created in D3DPOOL_DEFAULT are not lockable.
*/
if (D3DPOOL_DEFAULT == Pool) {
object->surfaces[i]->lockable = FALSE;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("Created surface level %d @ %p, memory at %p\n", i, object->surfaces[i], object->surfaces[i]->allocatedMemory);
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
tmpW = max(1, tmpW / 2);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
tmpH = max(1, tmpH / 2);
}
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
*ppTexture = (LPDIRECT3DTEXTURE8) object;
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
TRACE("(%p) : Created texture %p\n", This, object);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 iface,
UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage,
D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture8** ppVolumeTexture) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DVolumeTexture8Impl *object;
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
int i;
UINT tmpW;
UINT tmpH;
UINT tmpD;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
/* Allocate the storage for it */
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVolumeTexture8Impl));
object->lpVtbl = &Direct3DVolumeTexture8_Vtbl;
object->ResourceType = D3DRTYPE_VOLUMETEXTURE;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->Device = This;
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
object->ref = 1;
object->width = Width;
object->height = Height;
object->depth = Depth;
object->levels = Levels;
object->usage = Usage;
object->format = Format;
/* Calculate levels for mip mapping */
if (Levels == 0) {
object->levels++;
tmpW = Width;
tmpH = Height;
tmpD = Depth;
while (tmpW > 1 && tmpH > 1 && tmpD > 1) {
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
tmpW = max(1, tmpW / 2);
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
tmpH = max(1, tmpH / 2);
tmpD = max(1, tmpD / 2);
object->levels++;
}
TRACE("Calculated levels = %d\n", object->levels);
}
/* Generate all the surfaces */
tmpW = Width;
tmpH = Height;
tmpD = Depth;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
for (i = 0; i < object->levels; i++)
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
{
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DVolume8Impl* volume;
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
/* Create the volume - No entry point for this seperately?? */
volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVolume8Impl));
object->volumes[i] = (IDirect3DVolume8Impl *) volume;
volume->lpVtbl = &Direct3DVolume8_Vtbl;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
volume->Device = This;
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
volume->ResourceType = D3DRTYPE_VOLUME;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
volume->Container = (IUnknown*) object;
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
volume->ref = 1;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
volume->myDesc.Width = Width;
volume->myDesc.Height = Height;
volume->myDesc.Depth = Depth;
volume->myDesc.Format = Format;
volume->myDesc.Type = D3DRTYPE_VOLUME;
volume->myDesc.Pool = Pool;
volume->myDesc.Usage = Usage;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
volume->bytesPerPixel = D3DFmtGetBpp(This, Format);
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
volume->myDesc.Size = (Width * volume->bytesPerPixel) * Height * Depth;
volume->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->myDesc.Size);
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
volume->lockable = TRUE;
volume->locked = FALSE;
memset(&volume->lockedBox, 0, sizeof(D3DBOX));
volume->Dirty = FALSE;
IDirect3DVolume8Impl_CleanDirtyBox((LPDIRECT3DVOLUME8) volume);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) : Volume at w(%d) h(%d) d(%d) fmt(%u,%s) surf@%p, surfmem@%p, %d bytes\n",
This, Width, Height, Depth, Format, debug_d3dformat(Format),
volume, volume->allocatedMemory, volume->myDesc.Size);
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
tmpW = max(1, tmpW / 2);
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
tmpH = max(1, tmpH / 2);
tmpD = max(1, tmpD / 2);
}
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
*ppVolumeTexture = (LPDIRECT3DVOLUMETEXTURE8) object;
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
TRACE("(%p) : Created volume texture %p\n", This, object);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, UINT EdgeLength, UINT Levels, DWORD Usage,
D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8** ppCubeTexture) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DCubeTexture8Impl *object;
ICOM_THIS(IDirect3DDevice8Impl,iface);
int i,j;
UINT tmpW;
/* Allocate the storage for it */
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
TRACE("(%p) : Len(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%s)\n", This, EdgeLength, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DCubeTexture8Impl));
object->lpVtbl = &Direct3DCubeTexture8_Vtbl;
object->ref = 1;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->Device = This;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->ResourceType = D3DRTYPE_CUBETEXTURE;
object->edgeLength = EdgeLength;
object->levels = Levels;
object->usage = Usage;
object->format = Format;
/* Calculate levels for mip mapping */
if (Levels == 0) {
object->levels++;
tmpW = EdgeLength;
while (tmpW > 1) {
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
tmpW = max(1, tmpW / 2);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->levels++;
}
TRACE("Calculated levels = %d\n", object->levels);
}
/* Generate all the surfaces */
tmpW = EdgeLength;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
for (i = 0; i < object->levels; i++) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Create the 6 faces */
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
for (j = 0; j < 6; j++) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DDevice8Impl_CreateImageSurface(iface, tmpW, tmpW, Format, (LPDIRECT3DSURFACE8*) &object->surfaces[j][i]);
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
object->surfaces[j][i]->Container = (IUnknown*) object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->surfaces[j][i]->myDesc.Usage = Usage;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
object->surfaces[j][i]->myDesc.Pool = Pool;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
/**
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
* As written in msdn in IDirect3DCubeTexture8::LockRect
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
* Textures created in D3DPOOL_DEFAULT are not lockable.
*/
if (D3DPOOL_DEFAULT == Pool) {
object->surfaces[j][i]->lockable = FALSE;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("Created surface level %d @ %p, memory at %p\n", i, object->surfaces[j][i], object->surfaces[j][i]->allocatedMemory);
}
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
tmpW = max(1, tmpW / 2);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
TRACE("(%p) : Iface@%p\n", This, object);
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
*ppCubeTexture = (LPDIRECT3DCUBETEXTURE8) object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 iface, UINT Size, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer8** ppVertexBuffer) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DVertexBuffer8Impl *object;
ICOM_THIS(IDirect3DDevice8Impl,iface);
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer8Impl));
object->lpVtbl = &Direct3DVertexBuffer8_Vtbl;
object->Device = This;
object->ResourceType = D3DRTYPE_VERTEXBUFFER;
object->ref = 1;
object->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size);
object->currentDesc.Usage = Usage;
object->currentDesc.Pool = Pool;
object->currentDesc.FVF = FVF;
object->currentDesc.Size = Size;
TRACE("(%p) : Size=%d, Usage=%ld, FVF=%lx, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->allocatedMemory, object);
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
*ppVertexBuffer = (LPDIRECT3DVERTEXBUFFER8) object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer8** ppIndexBuffer) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DIndexBuffer8Impl *object;
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
TRACE("(%p) : Len=%d, Use=%lx, Format=(%u,%s), Pool=%d\n", This, Length, Usage, Format, debug_d3dformat(Format), Pool);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DIndexBuffer8Impl));
object->lpVtbl = &Direct3DIndexBuffer8_Vtbl;
object->Device = This;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->ref = 1;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->ResourceType = D3DRTYPE_INDEXBUFFER;
object->currentDesc.Type = D3DRTYPE_INDEXBUFFER;
object->currentDesc.Usage = Usage;
object->currentDesc.Pool = Pool;
object->currentDesc.Format = Format;
object->currentDesc.Size = Length;
object->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length);
TRACE("(%p) : Iface@%p allocatedMem @ %p\n", This, object, object->allocatedMemory);
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
*ppIndexBuffer = (LPDIRECT3DINDEXBUFFER8) object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) {
IDirect3DSurface8Impl *object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl));
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
if (NULL == object) {
*ppSurface = NULL;
return D3DERR_OUTOFVIDEOMEMORY;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
*ppSurface = (LPDIRECT3DSURFACE8) object;
object->lpVtbl = &Direct3DSurface8_Vtbl;
object->Device = This;
object->ResourceType = D3DRTYPE_SURFACE;
object->Container = (IUnknown*) This;
object->ref = 1;
object->myDesc.Width = Width;
object->myDesc.Height = Height;
object->myDesc.Format = Format;
object->myDesc.Type = D3DRTYPE_SURFACE;
object->myDesc.Usage = D3DUSAGE_RENDERTARGET;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
object->myDesc.Pool = D3DPOOL_DEFAULT;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.MultiSampleType = MultiSample;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
object->bytesPerPixel = D3DFmtGetBpp(This, Format);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.Size = (Width * object->bytesPerPixel) * Height;
object->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->myDesc.Size);
object->lockable = Lockable;
object->locked = FALSE;
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
memset(&object->lockedRect, 0, sizeof(RECT));
IDirect3DSurface8Impl_CleanDirtyRect((LPDIRECT3DSURFACE8) object);
- 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
TRACE("(%p) : w(%d) h(%d) fmt(%d,%s) lockable(%d) surf@%p, surfmem@%p, %d bytes\n", This, Width, Height, Format, debug_d3dformat(Format), Lockable, *ppSurface, object->allocatedMemory, object->myDesc.Size);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) {
IDirect3DSurface8Impl *object;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl));
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
if (NULL == object) {
*ppSurface = NULL;
return D3DERR_OUTOFVIDEOMEMORY;
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
*ppSurface = (LPDIRECT3DSURFACE8) object;
object->lpVtbl = &Direct3DSurface8_Vtbl;
object->Device = This;
object->ResourceType = D3DRTYPE_SURFACE;
object->Container = (IUnknown*) This;
object->ref = 1;
object->myDesc.Width = Width;
object->myDesc.Height = Height;
object->myDesc.Format = Format;
object->myDesc.Type = D3DRTYPE_SURFACE;
object->myDesc.Usage = D3DUSAGE_DEPTHSTENCIL;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
object->myDesc.Pool = D3DPOOL_DEFAULT;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.MultiSampleType = MultiSample;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
object->bytesPerPixel = D3DFmtGetBpp(This, Format);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.Size = (Width * object->bytesPerPixel) * Height;
object->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->myDesc.Size);
- 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
object->lockable = (D3DFMT_D16_LOCKABLE == Format) ? TRUE : FALSE;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->locked = FALSE;
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
memset(&object->lockedRect, 0, sizeof(RECT));
IDirect3DSurface8Impl_CleanDirtyRect((LPDIRECT3DSURFACE8) object);
- 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
TRACE("(%p) : w(%d) h(%d) fmt(%d,%s) surf@%p, surfmem@%p, %d bytes\n", This, Width, Height, Format, debug_d3dformat(Format), *ppSurface, object->allocatedMemory, object->myDesc.Size);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DSurface8Impl *object;
ICOM_THIS(IDirect3DDevice8Impl,iface);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl));
*ppSurface = (LPDIRECT3DSURFACE8) object;
object->lpVtbl = &Direct3DSurface8_Vtbl;
object->Device = This;
object->ResourceType = D3DRTYPE_SURFACE;
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
object->Container = (IUnknown*) This;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->ref = 1;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.Width = Width;
object->myDesc.Height = Height;
object->myDesc.Format = Format;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->myDesc.Type = D3DRTYPE_SURFACE;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->myDesc.Usage = 0;
object->myDesc.Pool = D3DPOOL_SYSTEMMEM;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
object->bytesPerPixel = D3DFmtGetBpp(This, Format);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
object->myDesc.Size = (Width * object->bytesPerPixel) * Height;
object->allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->myDesc.Size);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
object->lockable = TRUE;
object->locked = FALSE;
- cleaning of volume.c/volumetexture.c as done previously for surface.c/*texture.c (with add of lockable, locked and Dirty flags) - add of dirtyRect/dirtyBox for better dirtification management (not used yet, but huge optimisation can be possible now) - fix some debug traces (well it's better to use debug_d3dpool) - fix some stupid regression on point parameters (forgot to check extension on fillcaps)
2003-06-05 01:05:46 +02:00
memset(&object->lockedRect, 0, sizeof(RECT));
IDirect3DSurface8Impl_CleanDirtyRect((LPDIRECT3DSURFACE8) object);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- 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
TRACE("(%p) : w(%d) h(%d) fmt(%d,%s) surf@%p, surfmem@%p, %d bytes\n", This, Width, Height, Format, debug_d3dformat(Format), *ppSurface, object->allocatedMemory, object->myDesc.Size);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface,
IDirect3DSurface8* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects,
IDirect3DSurface8* pDestinationSurface, CONST POINT* pDestPointsArray) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
HRESULT rc = D3D_OK;
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
IDirect3DBaseTexture8* texture = NULL;
Copyrect should flag destination texture as dirty, to force it to be reloaded.
2003-01-14 23:53:50 +01:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
IDirect3DSurface8Impl* src = (IDirect3DSurface8Impl*) pSourceSurface;
IDirect3DSurface8Impl* dst = (IDirect3DSurface8Impl*) pDestinationSurface;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", This,
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
pSourceSurface, pSourceRectsArray, cRects, pDestinationSurface, pDestPointsArray);
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
/* Note: Not sure about the d3dfmt_unknown bit, but seems to avoid a problem inside
a sample and doesnt seem to break anything as far as I can tell */
if (src->myDesc.Format != dst->myDesc.Format && (dst->myDesc.Format != D3DFMT_UNKNOWN)) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("Formats do not match (%x,%s) / (%x,%s)\n",
src->myDesc.Format, debug_d3dformat(src->myDesc.Format),
dst->myDesc.Format, debug_d3dformat(dst->myDesc.Format));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
rc = D3DERR_INVALIDCALL;
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
Copyrect should flag destination texture as dirty, to force it to be reloaded.
2003-01-14 23:53:50 +01:00
} else if (dst->myDesc.Format == D3DFMT_UNKNOWN) {
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
TRACE("Converting dest to same format as source, since dest was unknown\n");
dst->myDesc.Format = src->myDesc.Format;
/* Convert container as well */
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
IDirect3DSurface8Impl_GetContainer((LPDIRECT3DSURFACE8) dst, &IID_IDirect3DBaseTexture8, (void**) &texture); /* FIXME: Which refid? */
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
if (texture != NULL) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
((IDirect3DBaseTexture8Impl*) texture)->format = src->myDesc.Format;
Beginning of more COM compliant behavior: - AddRef/Release where needed - use IUnknown* instead void* - fix many GetDevice using AddRef - fix IDirect3DSurface8Impl_GetContainer using QueryInterface
2003-01-15 00:05:39 +01:00
/** Releasing texture after GetContainer */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DBaseTexture8_Release(texture);
texture = NULL;
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
/* Quick if complete copy ... */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
if (rc == D3D_OK && cRects == 0 && pSourceRectsArray == NULL && pDestPointsArray == NULL) {
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
if (src->myDesc.Width == dst->myDesc.Width && src->myDesc.Height == dst->myDesc.Height) {
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DLOCKED_RECT lrSrc;
D3DLOCKED_RECT lrDst;
IDirect3DSurface8Impl_LockRect((LPDIRECT3DSURFACE8) src, &lrSrc, NULL, D3DLOCK_READONLY);
IDirect3DSurface8Impl_LockRect((LPDIRECT3DSURFACE8) dst, &lrDst, NULL, 0L);
TRACE("Locked src and dst, Direct copy as surfaces are equal, w=%d, h=%d\n", dst->myDesc.Width, dst->myDesc.Height);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
memcpy(lrDst.pBits, lrSrc.pBits, src->myDesc.Size);
IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) src);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
rc = IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) dst);
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
TRACE("Unlocked src and dst\n");
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
} else {
FIXME("Wanted to copy all surfaces but size not compatible\n");
rc = D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
} else {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
if (NULL != pSourceRectsArray && NULL != pDestPointsArray) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
int bytesPerPixel = ((IDirect3DSurface8Impl*) pSourceSurface)->bytesPerPixel;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
int i;
Add copyrects support.
2002-10-28 21:07:24 +01:00
/* Copy rect by rect */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
for (i = 0; i < cRects; i++) {
CONST RECT* r = &pSourceRectsArray[i];
CONST POINT* p = &pDestPointsArray[i];
int copyperline = (r->right - r->left) * bytesPerPixel;
Add copyrects support.
2002-10-28 21:07:24 +01:00
int j;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DLOCKED_RECT lrSrc;
D3DLOCKED_RECT lrDst;
RECT dest_rect;
Add copyrects support.
2002-10-28 21:07:24 +01:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (%ld,%ld)\n", i, r->left, r->top, r->right, r->bottom, p->x, p->y);
Add copyrects support.
2002-10-28 21:07:24 +01:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
IDirect3DSurface8Impl_LockRect((LPDIRECT3DSURFACE8) src, &lrSrc, r, D3DLOCK_READONLY);
dest_rect.left = p->x;
dest_rect.top = p->y;
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
dest_rect.right = p->x + (r->right - r->left);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
dest_rect.left = p->y + (r->bottom - r->top);
IDirect3DSurface8Impl_LockRect((LPDIRECT3DSURFACE8) dst, &lrDst, &dest_rect, 0L);
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
TRACE("Locked src and dst\n");
Add copyrects support.
2002-10-28 21:07:24 +01:00
/* Find where to start */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
#if 0
Add copyrects support.
2002-10-28 21:07:24 +01:00
from = copyfrom + (r->top * pitchFrom) + (r->left * bytesPerPixel);
Calculate starting position for a copyrect correctly.
2003-01-09 07:02:39 +01:00
to = copyto + (p->y * pitchTo) + (p->x * bytesPerPixel);
Add copyrects support.
2002-10-28 21:07:24 +01:00
/* Copy line by line */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
for (j = 0; j < (r->bottom - r->top); j++) {
memcpy(to + (j * pitchTo), from + (j * pitchFrom), copyperline);
Add copyrects support.
2002-10-28 21:07:24 +01:00
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
#endif
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
for (j = 0; j < (r->bottom - r->top); j++) {
memcpy((char*) lrDst.pBits + (j * lrDst.Pitch), (char*) lrSrc.pBits + (j * lrSrc.Pitch), copyperline);
}
IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) src);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
rc = IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) dst);
CopyRects needs to lock the area it is copying to (esp. if that area is the back buffer, as locking/unlocking causes glread/draw pixels).
2003-05-14 01:39:53 +02:00
TRACE("Unlocked src and dst\n");
Add copyrects support.
2002-10-28 21:07:24 +01:00
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
} else {
FIXME("Wanted to copy partial surfaces not implemented\n");
rc = D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
Copyrect should flag destination texture as dirty, to force it to be reloaded.
2003-01-14 23:53:50 +01:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
return rc;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_UpdateTexture(LPDIRECT3DDEVICE8 iface, IDirect3DBaseTexture8* pSourceTexture, IDirect3DBaseTexture8* pDestinationTexture) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DBaseTexture8Impl* src = (IDirect3DBaseTexture8Impl*) pSourceTexture;
IDirect3DBaseTexture8Impl* dst = (IDirect3DBaseTexture8Impl*) pDestinationTexture;
D3DRESOURCETYPE srcType;
D3DRESOURCETYPE dstType;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p) : first try\n", This);
srcType = IDirect3DBaseTexture8Impl_GetType(pSourceTexture);
dstType = IDirect3DBaseTexture8Impl_GetType(pDestinationTexture);
if (srcType != dstType) {
return D3DERR_INVALIDCALL;
}
if (D3DPOOL_SYSTEMMEM != IDirect3DResource8Impl_GetPool((LPDIRECT3DRESOURCE8) src)) {
return D3DERR_INVALIDCALL;
}
if (D3DPOOL_DEFAULT != IDirect3DResource8Impl_GetPool((LPDIRECT3DRESOURCE8) dst)) {
return D3DERR_INVALIDCALL;
}
if (IDirect3DBaseTexture8Impl_IsDirty(pSourceTexture)) {
/** Only copy Dirty textures */
DWORD srcLevelCnt = IDirect3DBaseTexture8Impl_GetLevelCount(pSourceTexture);
DWORD dstLevelCnt = IDirect3DBaseTexture8Impl_GetLevelCount(pDestinationTexture);
DWORD skipLevels = (dstLevelCnt < srcLevelCnt) ? srcLevelCnt - dstLevelCnt : 0;
UINT i, j;
for (i = skipLevels; i < srcLevelCnt; ++i) {
HRESULT hr;
switch (srcType) {
case D3DRTYPE_TEXTURE:
{
IDirect3DSurface8* srcSur = NULL;
IDirect3DSurface8* dstSur = NULL;
hr = IDirect3DTexture8Impl_GetSurfaceLevel((LPDIRECT3DTEXTURE8) src, i, &srcSur);
hr = IDirect3DTexture8Impl_GetSurfaceLevel((LPDIRECT3DTEXTURE8) dst, i - skipLevels, &dstSur);
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
/* Fixme: Work out how to just do the dirty regions (src or dst dirty region, and what
about dst with less levels than the source?) */
IDirect3DDevice8Impl_CopyRects(iface, srcSur, NULL, 0, dstSur, NULL);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DSurface8Impl_Release(srcSur);
IDirect3DSurface8Impl_Release(dstSur);
}
break;
case D3DRTYPE_VOLUMETEXTURE:
{
FIXME("D3DRTYPE_VOLUMETEXTURE reload currently not implemented\n");
}
break;
case D3DRTYPE_CUBETEXTURE:
{
IDirect3DSurface8* srcSur = NULL;
IDirect3DSurface8* dstSur = NULL;
for (j = 0; j < 5; ++j) {
hr = IDirect3DCubeTexture8Impl_GetCubeMapSurface((LPDIRECT3DCUBETEXTURE8) src, j, i, &srcSur);
hr = IDirect3DCubeTexture8Impl_GetCubeMapSurface((LPDIRECT3DCUBETEXTURE8) dst, j, i - skipLevels, &srcSur);
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
FIXME("D3DRTYPE_CUBETEXTURE does not support UpdateTexture yet\n");
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DSurface8Impl_Release(srcSur);
IDirect3DSurface8Impl_Release(dstSur);
}
}
break;
default:
break;
}
}
IDirect3DBaseTexture8Impl_SetDirty(pSourceTexture, FALSE);
}
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_GetFrontBuffer(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8* pDestSurface) {
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
HRESULT hr;
D3DLOCKED_RECT lockedRect;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
RECT wantedRect;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
GLint prev_store;
GLenum prev_read;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
FIXME("(%p) : see if behavior correct\n", This);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
if (D3DFMT_A8R8G8B8 != ((IDirect3DSurface8Impl*) pDestSurface)->myDesc.Format) {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
ERR("(%p) : surface(%p) have a invalid format\n", This, pDestSurface);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return D3DERR_INVALIDCALL;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
wantedRect.left = 0;
wantedRect.top = 0;
wantedRect.right = This->PresentParms.BackBufferWidth;
wantedRect.bottom = This->PresentParms.BackBufferHeight;
hr = IDirect3DSurface8Impl_LockRect(pDestSurface, &lockedRect, &wantedRect, 0);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
if (FAILED(hr)) {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
ERR("(%p) : cannot lock surface\n", This);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return D3DERR_INVALIDCALL;
}
ENTER_GL();
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
/*
{
IDirect3DSurface8Impl* tmp = ((IDirect3DSurface8Impl*) pDestSurface);
FIXME("dest:%u,%u,bpp:%u\n", tmp->myDesc.Width, tmp->myDesc.Height, tmp->bytesPerPixel);
FIXME("dest2:pitch%u\n", lockedRect.Pitch);
FIXME("src:%u,%u\n", This->PresentParms.BackBufferWidth, This->PresentParms.BackBufferHeight);
tmp = This->frontBuffer;
FIXME("src2:%u,%u,bpp:%u\n", tmp->myDesc.Width, tmp->myDesc.Height, tmp->bytesPerPixel);
}
*/
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
glFlush();
vcheckGLcall("glFlush");
glGetIntegerv(GL_READ_BUFFER, &prev_read);
vcheckGLcall("glIntegerv");
glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store);
vcheckGLcall("glIntegerv");
glReadBuffer(GL_FRONT);
vcheckGLcall("glReadBuffer");
glPixelStorei(GL_PACK_SWAP_BYTES, TRUE);
vcheckGLcall("glPixelStorei");
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
/* stupid copy */
{
long j;
for (j = 0; j < This->PresentParms.BackBufferHeight; ++j) {
/*memcpy(lockedRect.pBits + (j * lockedRect.Pitch), This->frontBuffer->allocatedMemory + (j * i), i);*/
glReadPixels(0, This->PresentParms.BackBufferHeight - j - 1, This->PresentParms.BackBufferWidth, 1,
GL_BGRA, GL_UNSIGNED_BYTE, ((char*) lockedRect.pBits) + (j * lockedRect.Pitch));
vcheckGLcall("glReadPixels");
}
}
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
glPixelStorei(GL_PACK_SWAP_BYTES, prev_store);
vcheckGLcall("glPixelStorei");
glReadBuffer(prev_read);
vcheckGLcall("glReadBuffer");
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
LEAVE_GL();
hr = IDirect3DSurface8Impl_UnlockRect(pDestSurface);
return hr;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8* pRenderTarget, IDirect3DSurface8* pNewZStencil) {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
HRESULT hr;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if ((IDirect3DSurface8Impl*) pRenderTarget == This->renderTarget && (IDirect3DSurface8Impl*) pNewZStencil == This->stencilBufferTarget) {
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
TRACE("Trying to do a NOP SetRenderTarget operation\n");
return D3D_OK;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DDevice8Impl_CleanRender(iface);
if ((IDirect3DSurface8Impl*) pRenderTarget == This->frontBuffer && (IDirect3DSurface8Impl*) pNewZStencil == This->depthStencilBuffer) {
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
IDirect3DSurface8Impl* tmp;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("retoring SetRenderTarget defaults\n");
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
tmp = This->renderTarget;
This->renderTarget = (IDirect3DSurface8Impl*) This->frontBuffer;
IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) This->renderTarget);
IDirect3DSurface8Impl_Release((LPDIRECT3DSURFACE8) tmp);
tmp = This->stencilBufferTarget;
This->stencilBufferTarget = (IDirect3DSurface8Impl*) This->depthStencilBuffer;
if (NULL != This->stencilBufferTarget) IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) This->stencilBufferTarget);
if (NULL != tmp) IDirect3DSurface8Impl_Release((LPDIRECT3DSURFACE8) tmp);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
return D3D_OK;
}
TRACE("(%p) : expect crash newRender@%p newZStencil@%p\n", This, pRenderTarget, pNewZStencil);
hr = IDirect3DDevice8Impl_ActiveRender(iface, pRenderTarget, pNewZStencil);
return hr;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8** ppRenderTarget) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p)->(%p) default(%p)\n", This, This->renderTarget, This->frontBuffer);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
*ppRenderTarget = (LPDIRECT3DSURFACE8) This->renderTarget;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) *ppRenderTarget);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8** ppZStencilSurface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
TRACE("(%p)->(%p) default(%p)\n", This, This->stencilBufferTarget, This->depthStencilBuffer);
Handle creation of a depth/stencil buffer when creating a device. Implement IDirect3D8DeviceImpl_GetDepthStencilBuffer.
2003-04-17 04:16:07 +02:00
/* Note inc ref on returned surface */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
*ppZStencilSurface = (LPDIRECT3DSURFACE8) This->stencilBufferTarget;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
if (NULL != *ppZStencilSurface) IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) *ppZStencilSurface);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : stub\n", This);
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) {
Fixed compilation problems.
2003-06-06 20:12:59 +02:00
IDirect3DBaseTexture8* cont = NULL;
HRESULT hr;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p)\n", This);
ENTER_GL();
glFlush();
checkGLcall("glFlush");
/* Useful for debugging sometimes!
printf("Hit Enter ...\n");
getchar(); */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (This->frontBuffer != This->renderTarget) {
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
{
GLenum prev_read;
glGetIntegerv(GL_READ_BUFFER, &prev_read);
vcheckGLcall("glIntegerv");
glReadBuffer(GL_BACK);
vcheckGLcall("glReadBuffer");
{
long j;
long pitch = This->renderTarget->myDesc.Width * This->renderTarget->bytesPerPixel;
for (j = 0; j < This->renderTarget->myDesc.Height; ++j) {
glReadPixels(0,
This->renderTarget->myDesc.Height - j - 1,
This->renderTarget->myDesc.Width,
1,
D3DFmt2GLFmt(This, This->renderTarget->myDesc.Format),
D3DFmt2GLType(This, This->renderTarget->myDesc.Format),
This->renderTarget->allocatedMemory + j * pitch);
vcheckGLcall("glReadPixels");
}
}
glReadBuffer(prev_read);
vcheckGLcall("glReadBuffer");
}
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
hr = IDirect3DSurface8_GetContainer((LPDIRECT3DSURFACE8) This->renderTarget, &IID_IDirect3DBaseTexture8, (void**) &cont);
if (SUCCEEDED(hr) && NULL != cont) {
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
/** always dirtify for now. we must find a better way to see that surface have been modified */
IDirect3DBaseTexture8Impl_SetDirty(cont, TRUE);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
IDirect3DBaseTexture8_PreLoad(cont);
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
IDirect3DBaseTexture8Impl_Release(cont);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
cont = NULL;
}
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
LEAVE_GL();
return D3D_OK;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
/* TODO: From MSDN This method fails if you specify the D3DCLEAR_ZBUFFER or D3DCLEAR_STENCIL flags when the
render target does not have an attached depth buffer. Similarly, if you specify the D3DCLEAR_STENCIL flag
when the depth-buffer format does not contain stencil buffer information, this method fails. */
GLbitfield glMask = 0;
- surface pool init fixes - minor indentation and traces fixes - fix locking/unlocking/dirty behavior (dirtify on lock) + optimisations (only copy when dirty) - fix IDirect3DDevice8::Clear behavior (problem seen after a locking/unlocking code error) - begin to fix volume and cube textures management
2003-05-12 05:10:27 +02:00
GLboolean old_ztest;
GLfloat old_z_clear_value;
GLint old_stencil_clear_value;
GLfloat old_color_clear_value[4];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
int i;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
CONST D3DRECT* curRect;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("(%p) Count (%ld), pRects (%p), Flags (%lx), Z (%f), Stencil (%ld)\n", This,
Count, pRects, Flags, Z, Stencil);
ENTER_GL();
if (Count > 0 && pRects) {
glEnable(GL_SCISSOR_TEST);
checkGLcall("glEnable GL_SCISSOR_TEST");
curRect = pRects;
} else {
curRect = NULL;
}
Avoid setting and resetting the same values when there are many rectangles.
2003-05-22 05:35:24 +02:00
/* Only set the values up once, as they are not changing */
if (Flags & D3DCLEAR_STENCIL) {
glGetIntegerv(GL_STENCIL_CLEAR_VALUE, &old_stencil_clear_value);
glClearStencil(Stencil);
checkGLcall("glClearStencil");
glMask = glMask | GL_STENCIL_BUFFER_BIT;
}
if (Flags & D3DCLEAR_ZBUFFER) {
glGetBooleanv(GL_DEPTH_WRITEMASK, &old_ztest);
glDepthMask(GL_TRUE);
glGetFloatv(GL_DEPTH_CLEAR_VALUE, &old_z_clear_value);
glClearDepth(Z);
checkGLcall("glClearDepth");
glMask = glMask | GL_DEPTH_BUFFER_BIT;
}
if (Flags & D3DCLEAR_TARGET) {
TRACE("Clearing screen with glClear to color %lx\n", Color);
glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value);
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
glClearColor(((Color >> 16) & 0xFF) / 255.0f,
((Color >> 8) & 0xFF) / 255.0f,
((Color >> 0) & 0xFF) / 255.0f,
((Color >> 24) & 0xFF) / 255.0f);
Avoid setting and resetting the same values when there are many rectangles.
2003-05-22 05:35:24 +02:00
checkGLcall("glClearColor");
glMask = glMask | GL_COLOR_BUFFER_BIT;
}
/* Now process each rect in turn */
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
for (i = 0; i < Count || i == 0; i++) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
if (curRect) {
/* Note gl uses lower left, width/height */
TRACE("(%p) %p Rect=(%ld,%ld)->(%ld,%ld) glRect=(%ld,%ld), len=%ld, hei=%ld\n", This, curRect,
curRect->x1, curRect->y1, curRect->x2, curRect->y2,
Supply the correct box on the screen to be processed during the clear call, using opengl coordinates, not directx coordinates.
2003-05-16 01:14:33 +02:00
curRect->x1, (This->PresentParms.BackBufferHeight - curRect->y2),
curRect->x2 - curRect->x1, curRect->y2 - curRect->y1);
glScissor(curRect->x1, (This->PresentParms.BackBufferHeight - curRect->y2),
curRect->x2 - curRect->x1, curRect->y2 - curRect->y1);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glScissor");
}
Avoid setting and resetting the same values when there are many rectangles.
2003-05-22 05:35:24 +02:00
/* Clear the selected rectangle (or full screen) */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
glClear(glMask);
checkGLcall("glClear");
Avoid setting and resetting the same values when there are many rectangles.
2003-05-22 05:35:24 +02:00
/* Step to the next rectangle */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
if (curRect) curRect = curRect + sizeof(D3DRECT);
}
Avoid setting and resetting the same values when there are many rectangles.
2003-05-22 05:35:24 +02:00
/* Restore the old values (why..?) */
if (Flags & D3DCLEAR_STENCIL) {
glClearStencil(old_stencil_clear_value);
}
if (Flags & D3DCLEAR_ZBUFFER) {
glDepthMask(old_ztest);
glClearDepth(old_z_clear_value);
}
if (Flags & D3DCLEAR_TARGET) {
glClearColor(old_color_clear_value[0],
old_color_clear_value[1],
old_color_clear_value[2],
old_color_clear_value[3]);
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
if (Count > 0 && pRects) {
glDisable(GL_SCISSOR_TEST);
checkGLcall("glDisable");
}
LEAVE_GL();
return D3D_OK;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
int k;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Most of this routine, comments included copied from ddraw tree initially: */
TRACE("(%p) : State=%d\n", This, d3dts);
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
This->UpdateStateBlock->Changed.transform[d3dts] = TRUE;
This->UpdateStateBlock->Set.transform[d3dts] = TRUE;
memcpy(&This->UpdateStateBlock->transforms[d3dts], lpmatrix, sizeof(D3DMATRIX));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
/*
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
* if the new matrix is the same as the current one,
* we cut off any further processing. this seems to be a reasonable
* optimization because as was noticed, some apps (warcraft3 for example)
* tend towards setting the same matrix repeatedly for some dumb reason.
*
* From here on we assume that the new matrix is different, wherever it matters
* but note
*/
if (!memcmp(&This->StateBlock->transforms[d3dts].u.m[0][0], lpmatrix, sizeof(D3DMATRIX))) {
TRACE("The app is setting the same matrix over again\n");
return D3D_OK;
- beginning of vertex matrix blending using extensions (currently alpha alpha stage as i haven't understand needed extension behavior) - modify SetRenderState for matrix blending specific params - by default diffuse color is white ;) - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-15 00:12:37 +01:00
} else {
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
conv_mat(lpmatrix, &This->StateBlock->transforms[d3dts].u.m[0][0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
/*
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
ScreenCoord = ProjectionMat * ViewMat * WorldMat * ObjectCoord
where ViewMat = Camera space, WorldMat = world space.
In OpenGL, camera and world space is combined into GL_MODELVIEW
matrix. The Projection matrix stay projection matrix.
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
*/
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* Capture the times we can just ignore the change */
if (d3dts == D3DTS_WORLDMATRIX(0)) {
This->modelview_valid = FALSE;
return D3D_OK;
Only reapply the world, view or projection transform changes if we really have to.
2003-04-22 01:53:03 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
} else if (d3dts == D3DTS_PROJECTION) {
This->proj_valid = FALSE;
return D3D_OK;
Only reapply the world, view or projection transform changes if we really have to.
2003-04-22 01:53:03 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
} else if (d3dts >= D3DTS_WORLDMATRIX(1) && d3dts <= D3DTS_WORLDMATRIX(255)) { /* Indexed Vertex Blending Matrices 256 -> 511 */
/* Use arb_vertex_blend or NV_VERTEX_WEIGHTING? */
FIXME("D3DTS_WORLDMATRIX(1..255) not handled\n");
return D3D_OK;
}
/* Chances are we really are going to have to change a matrix */
ENTER_GL();
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
if (d3dts >= D3DTS_TEXTURE0 && d3dts <= D3DTS_TEXTURE7) { /* handle texture matrices */
if (d3dts < GL_LIMITS(textures)) {
int tex = d3dts - D3DTS_TEXTURE0;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
#if defined(GL_VERSION_1_3)
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
glActiveTexture(GL_TEXTURE0 + tex);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
#else
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
glActiveTextureARB(GL_TEXTURE0_ARB + tex);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
#endif
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
set_texture_matrix((float *)lpmatrix, This->UpdateStateBlock->texture_state[tex][D3DTSS_TEXTURETRANSFORMFLAGS]);
}
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
} else if (d3dts == D3DTS_VIEW) { /* handle the VIEW matrice */
float identity[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
This->modelview_valid = FALSE;
This->view_ident = !memcmp(lpmatrix, identity, 16*sizeof(float));
glMatrixMode(GL_MODELVIEW);
checkGLcall("glMatrixMode(GL_MODELVIEW)");
glPushMatrix();
glLoadMatrixf((float *)lpmatrix);
checkGLcall("glLoadMatrixf(...)");
/* If we are changing the View matrix, reset the light and clipping planes to the new view
* NOTE: We have to reset the positions even if the light/plane is not currently
* enabled, since the call to enable it will not reset the position.
* NOTE2: Apparently texture transforms do NOT need reapplying
*/
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* Reset lights */
for (k = 0; k < GL_LIMITS(lights); k++) {
glLightfv(GL_LIGHT0 + k, GL_POSITION, This->lightPosn[k]);
checkGLcall("glLightfv posn");
glLightfv(GL_LIGHT0 + k, GL_SPOT_DIRECTION, This->lightDirn[k]);
checkGLcall("glLightfv dirn");
}
/* Reset Clipping Planes if clipping is enabled */
for (k = 0; k < GL_LIMITS(clipplanes); k++) {
glClipPlane(GL_CLIP_PLANE0 + k, This->StateBlock->clipplane[k]);
checkGLcall("glClipPlane");
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
}
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
glPopMatrix();
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
} else { /* What was requested!?? */
WARN("invalid matrix specified: %i\n", d3dts);
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
- beginning of vertex matrix blending using extensions (currently alpha alpha stage as i haven't understand needed extension behavior) - modify SetRenderState for matrix blending specific params - by default diffuse color is white ;) - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-15 00:12:37 +01:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
/* Release lock, all done */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
LEAVE_GL();
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State,D3DMATRIX* pMatrix) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : for State %d\n", This, State);
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(pMatrix, &This->StateBlock->transforms[State], sizeof(D3DMATRIX));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_MultiplyTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) {
Add support for MultiplyTransform (helps make the SkimmedMesh SDK sample look better).
2003-05-06 02:19:11 +02:00
D3DMATRIX *mat = NULL;
D3DMATRIX temp;
/* Note: Using UpdateStateBlock means it would be recorded in a state block change,
but works regardless of recording being on.
If this is found to be wrong, change to StateBlock. */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
Add support for MultiplyTransform (helps make the SkimmedMesh SDK sample look better).
2003-05-06 02:19:11 +02:00
TRACE("(%p) : For state %u\n", This, State);
if (State < HIGHEST_TRANSFORMSTATE)
{
mat = &This->UpdateStateBlock->transforms[State];
} else {
FIXME("Unhandled transform state!!\n");
}
/* Copied from ddraw code: */
temp.u.s._11 = (mat->u.s._11 * pMatrix->u.s._11) + (mat->u.s._21 * pMatrix->u.s._12) + (mat->u.s._31 * pMatrix->u.s._13) + (mat->u.s._41 * pMatrix->u.s._14);
temp.u.s._21 = (mat->u.s._11 * pMatrix->u.s._21) + (mat->u.s._21 * pMatrix->u.s._22) + (mat->u.s._31 * pMatrix->u.s._23) + (mat->u.s._41 * pMatrix->u.s._24);
temp.u.s._31 = (mat->u.s._11 * pMatrix->u.s._31) + (mat->u.s._21 * pMatrix->u.s._32) + (mat->u.s._31 * pMatrix->u.s._33) + (mat->u.s._41 * pMatrix->u.s._34);
temp.u.s._41 = (mat->u.s._11 * pMatrix->u.s._41) + (mat->u.s._21 * pMatrix->u.s._42) + (mat->u.s._31 * pMatrix->u.s._43) + (mat->u.s._41 * pMatrix->u.s._44);
temp.u.s._12 = (mat->u.s._12 * pMatrix->u.s._11) + (mat->u.s._22 * pMatrix->u.s._12) + (mat->u.s._32 * pMatrix->u.s._13) + (mat->u.s._42 * pMatrix->u.s._14);
temp.u.s._22 = (mat->u.s._12 * pMatrix->u.s._21) + (mat->u.s._22 * pMatrix->u.s._22) + (mat->u.s._32 * pMatrix->u.s._23) + (mat->u.s._42 * pMatrix->u.s._24);
temp.u.s._32 = (mat->u.s._12 * pMatrix->u.s._31) + (mat->u.s._22 * pMatrix->u.s._32) + (mat->u.s._32 * pMatrix->u.s._33) + (mat->u.s._42 * pMatrix->u.s._34);
temp.u.s._42 = (mat->u.s._12 * pMatrix->u.s._41) + (mat->u.s._22 * pMatrix->u.s._42) + (mat->u.s._32 * pMatrix->u.s._43) + (mat->u.s._42 * pMatrix->u.s._44);
temp.u.s._13 = (mat->u.s._13 * pMatrix->u.s._11) + (mat->u.s._23 * pMatrix->u.s._12) + (mat->u.s._33 * pMatrix->u.s._13) + (mat->u.s._43 * pMatrix->u.s._14);
temp.u.s._23 = (mat->u.s._13 * pMatrix->u.s._21) + (mat->u.s._23 * pMatrix->u.s._22) + (mat->u.s._33 * pMatrix->u.s._23) + (mat->u.s._43 * pMatrix->u.s._24);
temp.u.s._33 = (mat->u.s._13 * pMatrix->u.s._31) + (mat->u.s._23 * pMatrix->u.s._32) + (mat->u.s._33 * pMatrix->u.s._33) + (mat->u.s._43 * pMatrix->u.s._34);
temp.u.s._43 = (mat->u.s._13 * pMatrix->u.s._41) + (mat->u.s._23 * pMatrix->u.s._42) + (mat->u.s._33 * pMatrix->u.s._43) + (mat->u.s._43 * pMatrix->u.s._44);
temp.u.s._14 = (mat->u.s._14 * pMatrix->u.s._11) + (mat->u.s._24 * pMatrix->u.s._12) + (mat->u.s._34 * pMatrix->u.s._13) + (mat->u.s._44 * pMatrix->u.s._14);
temp.u.s._24 = (mat->u.s._14 * pMatrix->u.s._21) + (mat->u.s._24 * pMatrix->u.s._22) + (mat->u.s._34 * pMatrix->u.s._23) + (mat->u.s._44 * pMatrix->u.s._24);
temp.u.s._34 = (mat->u.s._14 * pMatrix->u.s._31) + (mat->u.s._24 * pMatrix->u.s._32) + (mat->u.s._34 * pMatrix->u.s._33) + (mat->u.s._44 * pMatrix->u.s._34);
temp.u.s._44 = (mat->u.s._14 * pMatrix->u.s._41) + (mat->u.s._24 * pMatrix->u.s._42) + (mat->u.s._34 * pMatrix->u.s._43) + (mat->u.s._44 * pMatrix->u.s._44);
/* Apply change via set transform - will reapply to eg. lights this way */
IDirect3DDevice8Impl_SetTransform(iface, State, &temp);
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetViewport(LPDIRECT3DDEVICE8 iface, CONST D3DVIEWPORT8* pViewport) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p)\n", This);
This->UpdateStateBlock->Changed.viewport = TRUE;
This->UpdateStateBlock->Set.viewport = TRUE;
memcpy(&This->UpdateStateBlock->viewport, pViewport, sizeof(D3DVIEWPORT8));
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("(%p) : x=%ld, y=%ld, wid=%ld, hei=%ld, minz=%f, maxz=%f\n", This,
pViewport->X, pViewport->Y, pViewport->Width, pViewport->Height, pViewport->MinZ, pViewport->MaxZ);
glDepthRange(pViewport->MinZ, pViewport->MaxZ);
checkGLcall("glDepthRange");
Make sure the viewport is from the GL (bottom left) not the DirectX (top left).
2003-05-14 02:00:12 +02:00
/* Note: GL requires lower left, DirectX supplies upper left */
glViewport(pViewport->X, (This->PresentParms.BackBufferHeight - (pViewport->Y + pViewport->Height)),
pViewport->Width, pViewport->Height);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glViewport");
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetViewport(LPDIRECT3DDEVICE8 iface, D3DVIEWPORT8* pViewport) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p)\n", This);
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(pViewport, &This->StateBlock->viewport, sizeof(D3DVIEWPORT8));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, CONST D3DMATERIAL8* pMaterial) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
This->UpdateStateBlock->Changed.material = TRUE;
This->UpdateStateBlock->Set.material = TRUE;
memcpy(&This->UpdateStateBlock->material, pMaterial, sizeof(D3DMATERIAL8));
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
ENTER_GL();
TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a);
TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, pMaterial->Ambient.b, pMaterial->Ambient.a);
TRACE("(%p) : Specular (%f,%f,%f,%f)\n", This, pMaterial->Specular.r, pMaterial->Specular.g, pMaterial->Specular.b, pMaterial->Specular.a);
TRACE("(%p) : Emissive (%f,%f,%f,%f)\n", This, pMaterial->Emissive.r, pMaterial->Emissive.g, pMaterial->Emissive.b, pMaterial->Emissive.a);
TRACE("(%p) : Power (%f)\n", This, pMaterial->Power);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &This->UpdateStateBlock->material.Ambient);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glMaterialfv");
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &This->UpdateStateBlock->material.Diffuse);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glMaterialfv");
Correct specular enable renderstate.
2003-06-05 00:04:44 +02:00
/* Only change material color if specular is enabled, otherwise it is set to black */
if (This->StateBlock->renderstate[D3DRS_SPECULARENABLE]) {
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->UpdateStateBlock->material.Specular);
checkGLcall("glMaterialfv");
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &This->UpdateStateBlock->material.Emissive);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glMaterialfv");
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, This->UpdateStateBlock->material.Power);
checkGLcall("glMaterialf");
LEAVE_GL();
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetMaterial(LPDIRECT3DDEVICE8 iface, D3DMATERIAL8* pMaterial) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
memcpy(pMaterial, &This->UpdateStateBlock->material, sizeof (D3DMATERIAL8));
TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a);
TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, pMaterial->Ambient.b, pMaterial->Ambient.a);
TRACE("(%p) : Specular (%f,%f,%f,%f)\n", This, pMaterial->Specular.r, pMaterial->Specular.g, pMaterial->Specular.b, pMaterial->Specular.a);
TRACE("(%p) : Emissive (%f,%f,%f,%f)\n", This, pMaterial->Emissive.r, pMaterial->Emissive.g, pMaterial->Emissive.b, pMaterial->Emissive.a);
TRACE("(%p) : Power (%f)\n", This, pMaterial->Power);
return D3D_OK;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWORD Index, CONST D3DLIGHT8* pLight) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
float colRGBA[] = {0.0, 0.0, 0.0, 0.0};
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
float rho;
float quad_att;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : Idx(%ld), pLight(%p)\n", This, Index, pLight);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(lights)) {
Fixed range checking on the number of lights. Silence the fixmes.
2003-05-16 02:04:07 +02:00
TRACE("Cannot handle more lights than device supports\n");
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
return D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("Light %ld setting to type %d, Diffuse(%f,%f,%f,%f), Specular(%f,%f,%f,%f), Ambient(%f,%f,%f,%f)\n", Index, pLight->Type,
pLight->Diffuse.r, pLight->Diffuse.g, pLight->Diffuse.b, pLight->Diffuse.a,
pLight->Specular.r, pLight->Specular.g, pLight->Specular.b, pLight->Specular.a,
pLight->Ambient.r, pLight->Ambient.g, pLight->Ambient.b, pLight->Ambient.a);
TRACE("... Pos(%f,%f,%f), Dirn(%f,%f,%f)\n", pLight->Position.x, pLight->Position.y, pLight->Position.z,
pLight->Direction.x, pLight->Direction.y, pLight->Direction.z);
TRACE("... Range(%f), Falloff(%f), Theta(%f), Phi(%f)\n", pLight->Range, pLight->Falloff, pLight->Theta, pLight->Phi);
This->UpdateStateBlock->Changed.lights[Index] = TRUE;
This->UpdateStateBlock->Set.lights[Index] = TRUE;
memcpy(&This->UpdateStateBlock->lights[Index], pLight, sizeof(D3DLIGHT8));
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Diffuse: */
colRGBA[0] = pLight->Diffuse.r;
colRGBA[1] = pLight->Diffuse.g;
colRGBA[2] = pLight->Diffuse.b;
colRGBA[3] = pLight->Diffuse.a;
glLightfv(GL_LIGHT0+Index, GL_DIFFUSE, colRGBA);
checkGLcall("glLightfv");
/* Specular */
colRGBA[0] = pLight->Specular.r;
colRGBA[1] = pLight->Specular.g;
colRGBA[2] = pLight->Specular.b;
colRGBA[3] = pLight->Specular.a;
glLightfv(GL_LIGHT0+Index, GL_SPECULAR, colRGBA);
checkGLcall("glLightfv");
/* Ambient */
colRGBA[0] = pLight->Ambient.r;
colRGBA[1] = pLight->Ambient.g;
colRGBA[2] = pLight->Ambient.b;
colRGBA[3] = pLight->Ambient.a;
glLightfv(GL_LIGHT0+Index, GL_AMBIENT, colRGBA);
checkGLcall("glLightfv");
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
/* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/
- Use faster vertex arrays (rather than processing vertexes one by one), whenever possible. - Less trace in the slower form by default.
2003-01-03 22:25:42 +01:00
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
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
glLoadMatrixf((float *) &This->StateBlock->transforms[D3DTS_VIEW].u.m[0][0]);
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Attenuation - Are these right? guessing... */
glLightf(GL_LIGHT0+Index, GL_CONSTANT_ATTENUATION, pLight->Attenuation0);
checkGLcall("glLightf");
glLightf(GL_LIGHT0+Index, GL_LINEAR_ATTENUATION, pLight->Attenuation1);
checkGLcall("glLightf");
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
quad_att = 1.4/(pLight->Range*pLight->Range);
if (quad_att < pLight->Attenuation2) quad_att = pLight->Attenuation2;
glLightf(GL_LIGHT0+Index, GL_QUADRATIC_ATTENUATION, quad_att);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glLightf");
switch (pLight->Type) {
case D3DLIGHT_POINT:
/* Position */
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
This->lightPosn[Index][0] = pLight->Position.x;
This->lightPosn[Index][1] = pLight->Position.y;
This->lightPosn[Index][2] = pLight->Position.z;
This->lightPosn[Index][3] = 1.0;
glLightfv(GL_LIGHT0+Index, GL_POSITION, &This->lightPosn[Index][0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glLightfv");
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, 180);
checkGLcall("glLightf");
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* FIXME: Range */
break;
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DLIGHT_SPOT:
/* Position */
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
This->lightPosn[Index][0] = pLight->Position.x;
This->lightPosn[Index][1] = pLight->Position.y;
This->lightPosn[Index][2] = pLight->Position.z;
This->lightPosn[Index][3] = 1.0;
glLightfv(GL_LIGHT0+Index, GL_POSITION, &This->lightPosn[Index][0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glLightfv");
/* Direction */
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
This->lightDirn[Index][0] = pLight->Direction.x;
This->lightDirn[Index][1] = pLight->Direction.y;
This->lightDirn[Index][2] = pLight->Direction.z;
This->lightDirn[Index][3] = 1.0;
glLightfv(GL_LIGHT0+Index, GL_SPOT_DIRECTION, &This->lightDirn[Index][0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glLightfv");
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
/*
* opengl-ish and d3d-ish spot lights use too different models for the
* light "intensity" as a function of the angle towards the main light direction,
* so we only can approximate very roughly.
* however spot lights are rather rarely used in games (if ever used at all).
* furthermore if still used, probably nobody pays attention to such details.
*/
if (pLight->Falloff == 0) {
rho = 6.28f;
} else {
rho = pLight->Theta + (pLight->Phi - pLight->Theta)/(2*pLight->Falloff);
}
if (rho < 0.0001) rho = 0.0001f;
glLightf(GL_LIGHT0 + Index, GL_SPOT_EXPONENT, -0.3/log(cos(rho/2)));
glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, pLight->Phi*90/M_PI);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* FIXME: Range */
break;
case D3DLIGHT_DIRECTIONAL:
/* Direction */
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
This->lightPosn[Index][0] = -pLight->Direction.x;
This->lightPosn[Index][1] = -pLight->Direction.y;
This->lightPosn[Index][2] = -pLight->Direction.z;
This->lightPosn[Index][3] = 0.0;
glLightfv(GL_LIGHT0+Index, GL_POSITION, &This->lightPosn[Index][0]); /* Note gl uses w position of 0 for direction! */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glLightfv");
glLightf(GL_LIGHT0+Index, GL_SPOT_CUTOFF, 180.0f);
glLightf(GL_LIGHT0+Index, GL_SPOT_EXPONENT, 0.0f);
break;
default:
FIXME("Unrecognized light type %d\n", pLight->Type);
}
Significantly improve the lighting code.
2002-10-12 01:31:07 +02:00
/* Restore the modelview matrix */
glPopMatrix();
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetLight(LPDIRECT3DDEVICE8 iface, DWORD Index,D3DLIGHT8* pLight) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : Idx(%ld), pLight(%p)\n", This, Index, pLight);
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(lights)) {
Fixed range checking on the number of lights. Silence the fixmes.
2003-05-16 02:04:07 +02:00
TRACE("Cannot handle more lights than device supports\n");
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
return D3DERR_INVALIDCALL;
}
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(pLight, &This->StateBlock->lights[Index], sizeof(D3DLIGHT8));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL Enable) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : Idx(%ld), enable? %d\n", This, Index, Enable);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(lights)) {
Fixed range checking on the number of lights. Silence the fixmes.
2003-05-16 02:04:07 +02:00
TRACE("Cannot handle more lights than device supports\n");
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
return D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Changed.lightEnable[Index] = TRUE;
This->UpdateStateBlock->Set.lightEnable[Index] = TRUE;
This->UpdateStateBlock->lightEnable[Index] = Enable;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
if (Enable) {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glEnable(GL_LIGHT0 + Index);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glEnable GL_LIGHT0+Index");
} else {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glDisable(GL_LIGHT0 + Index);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glDisable GL_LIGHT0+Index");
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetLightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL* pEnable) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : for idx(%ld)\n", This, Index);
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(lights)) {
Fixed range checking on the number of lights. Silence the fixmes.
2003-05-16 02:04:07 +02:00
TRACE("Cannot handle more lights than device supports\n");
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
return D3DERR_INVALIDCALL;
}
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
*pEnable = This->StateBlock->lightEnable[Index];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_SetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,CONST float* pPlane) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : for idx %ld, %p\n", This, Index, pPlane);
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
/* Validate Index */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(clipplanes)) {
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
TRACE("Application has requested clipplane this device doesnt support\n");
return D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Changed.clipplane[Index] = TRUE;
This->UpdateStateBlock->Set.clipplane[Index] = TRUE;
This->UpdateStateBlock->clipplane[Index][0] = pPlane[0];
This->UpdateStateBlock->clipplane[Index][1] = pPlane[1];
This->UpdateStateBlock->clipplane[Index][2] = pPlane[2];
This->UpdateStateBlock->clipplane[Index][3] = pPlane[3];
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
/* Apply it */
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
/* Clip Plane settings are affected by the model view in OpenGL, the View transform in direct3d */
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
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
glLoadMatrixf((float *) &This->StateBlock->transforms[D3DTS_VIEW].u.m[0][0]);
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
TRACE("Clipplane [%f,%f,%f,%f]\n",
This->UpdateStateBlock->clipplane[Index][0],
This->UpdateStateBlock->clipplane[Index][1],
This->UpdateStateBlock->clipplane[Index][2],
This->UpdateStateBlock->clipplane[Index][3]);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
glClipPlane(GL_CLIP_PLANE0 + Index, This->UpdateStateBlock->clipplane[Index]);
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
checkGLcall("glClipPlane");
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
glPopMatrix();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,float* pPlane) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) : for idx %ld\n", This, Index);
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
/* Validate Index */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Index >= GL_LIMITS(clipplanes)) {
Use device max lights and clipplane support. Also change clipplane to be affected by view matrix.
2003-01-23 23:38:51 +01:00
TRACE("Application has requested clipplane this device doesnt support\n");
return D3DERR_INVALIDCALL;
}
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
pPlane[0] = This->StateBlock->clipplane[Index][0];
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
pPlane[1] = This->StateBlock->clipplane[Index][1];
pPlane[2] = This->StateBlock->clipplane[Index][2];
pPlane[3] = This->StateBlock->clipplane[Index][3];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3DRENDERSTATETYPE State,DWORD Value) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
DWORD OldValue = This->StateBlock->renderstate[State];
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
TRACE("(%p)->state = %s(%d), value = %ld\n", This, debug_d3drenderstate(State), State, Value);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Changed.renderstate[State] = TRUE;
This->UpdateStateBlock->Set.renderstate[State] = TRUE;
This->UpdateStateBlock->renderstate[State] = Value;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
switch (State) {
case D3DRS_FILLMODE :
switch ((D3DFILLMODE) Value) {
case D3DFILL_POINT : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break;
case D3DFILL_WIREFRAME : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break;
case D3DFILL_SOLID : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break;
default:
FIXME("Unrecognized D3DRS_FILLMODE value %ld\n", Value);
}
checkGLcall("glPolygonMode (fillmode)");
break;
case D3DRS_LIGHTING :
if (Value) {
glEnable(GL_LIGHTING);
checkGLcall("glEnable GL_LIGHTING");
} else {
glDisable(GL_LIGHTING);
checkGLcall("glDisable GL_LIGHTING");
}
break;
case D3DRS_ZENABLE :
switch ((D3DZBUFFERTYPE) Value) {
case D3DZB_FALSE:
glDisable(GL_DEPTH_TEST);
checkGLcall("glDisable GL_DEPTH_TEST");
break;
case D3DZB_TRUE:
glEnable(GL_DEPTH_TEST);
checkGLcall("glEnable GL_DEPTH_TEST");
break;
case D3DZB_USEW:
default:
FIXME("Unrecognized/Unhandled D3DZBUFFERTYPE value %ld\n", Value);
}
break;
case D3DRS_CULLMODE :
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
/* If we are culling "back faces with clockwise vertices" then
set front faces to be counter clockwise and enable culling
of back faces */
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
switch ((D3DCULL) Value) {
case D3DCULL_NONE:
glDisable(GL_CULL_FACE);
checkGLcall("glDisable GL_CULL_FACE");
break;
case D3DCULL_CW:
glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE");
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
glFrontFace(GL_CCW);
checkGLcall("glFrontFace GL_CCW");
glCullFace(GL_BACK);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
break;
case D3DCULL_CCW:
glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE");
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
glFrontFace(GL_CW);
checkGLcall("glFrontFace GL_CW");
glCullFace(GL_BACK);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
break;
default:
FIXME("Unrecognized/Unhandled D3DCULL value %ld\n", Value);
}
break;
case D3DRS_SHADEMODE :
switch ((D3DSHADEMODE) Value) {
case D3DSHADE_FLAT:
glShadeModel(GL_FLAT);
checkGLcall("glShadeModel");
break;
case D3DSHADE_GOURAUD:
glShadeModel(GL_SMOOTH);
checkGLcall("glShadeModel");
break;
case D3DSHADE_PHONG:
FIXME("D3DSHADE_PHONG isnt supported?\n");
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3DERR_INVALIDCALL;
default:
FIXME("Unrecognized/Unhandled D3DSHADEMODE value %ld\n", Value);
}
break;
case D3DRS_DITHERENABLE :
if (Value) {
glEnable(GL_DITHER);
checkGLcall("glEnable GL_DITHER");
} else {
glDisable(GL_DITHER);
checkGLcall("glDisable GL_DITHER");
}
break;
case D3DRS_ZWRITEENABLE :
if (Value) {
glDepthMask(1);
checkGLcall("glDepthMask");
} else {
glDepthMask(0);
checkGLcall("glDepthMask");
}
break;
case D3DRS_ZFUNC :
{
int glParm = GL_LESS;
switch ((D3DCMPFUNC) Value) {
case D3DCMP_NEVER: glParm=GL_NEVER; break;
case D3DCMP_LESS: glParm=GL_LESS; break;
case D3DCMP_EQUAL: glParm=GL_EQUAL; break;
case D3DCMP_LESSEQUAL: glParm=GL_LEQUAL; break;
case D3DCMP_GREATER: glParm=GL_GREATER; break;
case D3DCMP_NOTEQUAL: glParm=GL_NOTEQUAL; break;
case D3DCMP_GREATEREQUAL: glParm=GL_GEQUAL; break;
case D3DCMP_ALWAYS: glParm=GL_ALWAYS; break;
default:
FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value);
}
glDepthFunc(glParm);
checkGLcall("glDepthFunc");
}
break;
case D3DRS_AMBIENT :
{
float col[4];
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DCOLORTOGLFLOAT4(Value, col);
TRACE("Setting ambient to (%f,%f,%f,%f)\n", col[0], col[1], col[2], col[3]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, col);
checkGLcall("glLightModel for MODEL_AMBIENT");
}
break;
case D3DRS_ALPHABLENDENABLE :
if (Value) {
glEnable(GL_BLEND);
checkGLcall("glEnable GL_BLEND");
} else {
glDisable(GL_BLEND);
checkGLcall("glDisable GL_BLEND");
};
break;
case D3DRS_SRCBLEND :
case D3DRS_DESTBLEND :
{
int newVal = GL_ZERO;
switch (Value) {
case D3DBLEND_ZERO : newVal = GL_ZERO; break;
case D3DBLEND_ONE : newVal = GL_ONE; break;
case D3DBLEND_SRCCOLOR : newVal = GL_SRC_COLOR; break;
case D3DBLEND_INVSRCCOLOR : newVal = GL_ONE_MINUS_SRC_COLOR; break;
case D3DBLEND_SRCALPHA : newVal = GL_SRC_ALPHA; break;
case D3DBLEND_INVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; break;
case D3DBLEND_DESTALPHA : newVal = GL_DST_ALPHA; break;
case D3DBLEND_INVDESTALPHA : newVal = GL_ONE_MINUS_DST_ALPHA; break;
case D3DBLEND_DESTCOLOR : newVal = GL_DST_COLOR; break;
case D3DBLEND_INVDESTCOLOR : newVal = GL_ONE_MINUS_DST_COLOR; break;
case D3DBLEND_SRCALPHASAT : newVal = GL_SRC_ALPHA_SATURATE; break;
case D3DBLEND_BOTHSRCALPHA : newVal = GL_SRC_ALPHA;
This->srcBlend = newVal;
This->dstBlend = newVal;
break;
case D3DBLEND_BOTHINVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA;
This->srcBlend = newVal;
This->dstBlend = newVal;
break;
default:
FIXME("Unrecognized src/dest blend value %ld (%d)\n", Value, State);
}
if (State == D3DRS_SRCBLEND) This->srcBlend = newVal;
if (State == D3DRS_DESTBLEND) This->dstBlend = newVal;
TRACE("glBlendFunc src=%x, dst=%x\n", This->srcBlend, This->dstBlend);
glBlendFunc(This->srcBlend, This->dstBlend);
checkGLcall("glBlendFunc");
}
break;
case D3DRS_ALPHATESTENABLE :
if (Value) {
glEnable(GL_ALPHA_TEST);
checkGLcall("glEnable GL_ALPHA_TEST");
} else {
glDisable(GL_ALPHA_TEST);
checkGLcall("glDisable GL_ALPHA_TEST");
}
break;
Various fixes, typos corrected and clarifying trace points.
2002-10-07 20:24:28 +02:00
case D3DRS_ALPHAFUNC :
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
{
int glParm = GL_LESS;
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
float ref = ((float) This->StateBlock->renderstate[D3DRS_ALPHAREF]) / 255.0f;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
switch ((D3DCMPFUNC) Value) {
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
case D3DCMP_NEVER: glParm = GL_NEVER; break;
case D3DCMP_LESS: glParm = GL_LESS; break;
case D3DCMP_EQUAL: glParm = GL_EQUAL; break;
case D3DCMP_LESSEQUAL: glParm = GL_LEQUAL; break;
case D3DCMP_GREATER: glParm = GL_GREATER; break;
case D3DCMP_NOTEQUAL: glParm = GL_NOTEQUAL; break;
case D3DCMP_GREATEREQUAL: glParm = GL_GEQUAL; break;
case D3DCMP_ALWAYS: glParm = GL_ALWAYS; break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
default:
FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value);
}
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
TRACE("glAlphaFunc with Parm=%x, ref=%f\n", glParm, ref);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
glAlphaFunc(glParm, ref);
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
This->alphafunc = glParm;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glAlphaFunc");
}
break;
Various fixes, typos corrected and clarifying trace points.
2002-10-07 20:24:28 +02:00
case D3DRS_ALPHAREF :
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
{
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
int glParm = This->alphafunc;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
float ref = 1.0f;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
ref = ((float) Value) / 255.0f;
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
TRACE("glAlphaFunc with Parm=%x, ref=%f\n", glParm, ref);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
glAlphaFunc(glParm, ref);
checkGLcall("glAlphaFunc");
}
break;
case D3DRS_CLIPPLANEENABLE :
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
case D3DRS_CLIPPING :
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
{
- ClipPlanes work better. - Culling now configures itself properly.
2002-10-13 19:53:15 +02:00
/* Ensure we only do the changed clip planes */
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
DWORD enable = 0xFFFFFFFF;
DWORD disable = 0x00000000;
/* If enabling / disabling all */
if (State == D3DRS_CLIPPING) {
if (Value) {
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
enable = This->StateBlock->renderstate[D3DRS_CLIPPLANEENABLE];
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
disable = 0x00;
} else {
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
disable = This->StateBlock->renderstate[D3DRS_CLIPPLANEENABLE];
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
enable = 0x00;
}
} else {
enable = Value & ~OldValue;
disable = ~Value & OldValue;
}
if (enable & D3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); }
if (enable & D3DCLIPPLANE1) { glEnable(GL_CLIP_PLANE1); checkGLcall("glEnable(clip plane 1)"); }
if (enable & D3DCLIPPLANE2) { glEnable(GL_CLIP_PLANE2); checkGLcall("glEnable(clip plane 2)"); }
if (enable & D3DCLIPPLANE3) { glEnable(GL_CLIP_PLANE3); checkGLcall("glEnable(clip plane 3)"); }
if (enable & D3DCLIPPLANE4) { glEnable(GL_CLIP_PLANE4); checkGLcall("glEnable(clip plane 4)"); }
if (enable & D3DCLIPPLANE5) { glEnable(GL_CLIP_PLANE5); checkGLcall("glEnable(clip plane 5)"); }
if (disable & D3DCLIPPLANE0) { glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); }
if (disable & D3DCLIPPLANE1) { glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); }
if (disable & D3DCLIPPLANE2) { glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); }
if (disable & D3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); }
if (disable & D3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); }
if (disable & D3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); }
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
break;
case D3DRS_BLENDOP :
{
int glParm = GL_FUNC_ADD;
switch ((D3DBLENDOP) Value) {
case D3DBLENDOP_ADD : glParm = GL_FUNC_ADD; break;
case D3DBLENDOP_SUBTRACT : glParm = GL_FUNC_SUBTRACT; break;
case D3DBLENDOP_REVSUBTRACT : glParm = GL_FUNC_REVERSE_SUBTRACT; break;
case D3DBLENDOP_MIN : glParm = GL_MIN; break;
case D3DBLENDOP_MAX : glParm = GL_MAX; break;
default:
FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value);
}
- Fix bug in multitexturing introduced during dummy texture changes. - Additional traces.
2002-11-12 03:14:13 +01:00
TRACE("glBlendEquation(%x)\n", glParm);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
glBlendEquation(glParm);
checkGLcall("glBlendEquation");
}
break;
case D3DRS_TEXTUREFACTOR :
{
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
int i;
/* Note the texture color applies to all textures whereas
GL_TEXTURE_ENV_COLOR applies to active only */
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
float col[4];
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DCOLORTOGLFLOAT4(Value, col);
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
/* Set the default alpha blend color */
glBlendColor(col[0], col[1], col[2], col[3]);
checkGLcall("glBlendColor");
/* And now the default texture color as well */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
for (i = 0; i < GL_LIMITS(textures); i++) {
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/* Note the D3DRS value applies to all textures, but GL has one
per texture, so apply it now ready to be used! */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (GL_SUPPORT(ARB_MULTITEXTURE)) {
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
#if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + i);
#else
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
glActiveTextureARB(GL_TEXTURE0_ARB + i);
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
#endif
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
checkGLcall("Activate texture.. to update const color");
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
} else if (i>0) {
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
FIXME("Program using multiple concurrent textures which this opengl implementation doesnt support\n");
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
}
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]);
checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);");
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
break;
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
case D3DRS_SPECULARENABLE :
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
{
Correct specular enable renderstate.
2003-06-05 00:04:44 +02:00
/* Originally this used glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,GL_SEPARATE_SPECULAR_COLOR)
and (GL_LIGHT_MODEL_COLOR_CONTROL,GL_SINGLE_COLOR) to swap between enabled/disabled
specular color. This is wrong:
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
Separate specular color means the specular colour is maintained separately, whereas
Correct specular enable renderstate.
2003-06-05 00:04:44 +02:00
single color means it is merged in. However in both cases they are being used to
some extent.
To disable specular color, set it explicitly to black and turn off GL_COLOR_SUM_EXT
NOTE: If not supported dont give FIXME as very minimal impact and very few people are
yet running 1.4!
*/
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
if (Value) {
Correct specular enable renderstate.
2003-06-05 00:04:44 +02:00
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->UpdateStateBlock->material.Specular);
checkGLcall("glMaterialfv");
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
if (GL_SUPPORT(EXT_SECONDARY_COLOR)) {
glEnable(GL_COLOR_SUM_EXT);
} else {
TRACE("Specular colors cannot be enabled in this version of opengl\n");
}
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glEnable(GL_COLOR_SUM)");
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
} else {
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
float black[4] = {0.0f, 0.0f, 0.0f, 0.0f};
Correct specular enable renderstate.
2003-06-05 00:04:44 +02:00
/* for the case of enabled lighting: */
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]);
checkGLcall("glMaterialfv");
/* for the case of disabled lighting: */
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
if (GL_SUPPORT(EXT_SECONDARY_COLOR)) {
glDisable(GL_COLOR_SUM_EXT);
} else {
TRACE("Specular colors cannot be disabled in this version of opengl\n");
}
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glDisable(GL_COLOR_SUM)");
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
break;
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
case D3DRS_STENCILENABLE :
if (Value) {
glEnable(GL_STENCIL_TEST);
checkGLcall("glEnable GL_STENCIL_TEST");
} else {
glDisable(GL_STENCIL_TEST);
checkGLcall("glDisable GL_STENCIL_TEST");
}
break;
case D3DRS_STENCILFUNC :
{
int glParm = GL_ALWAYS;
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
int ref = This->StateBlock->renderstate[D3DRS_STENCILREF];
GLuint mask = This->StateBlock->renderstate[D3DRS_STENCILMASK];
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
switch ((D3DCMPFUNC) Value) {
case D3DCMP_NEVER: glParm=GL_NEVER; break;
case D3DCMP_LESS: glParm=GL_LESS; break;
case D3DCMP_EQUAL: glParm=GL_EQUAL; break;
case D3DCMP_LESSEQUAL: glParm=GL_LEQUAL; break;
case D3DCMP_GREATER: glParm=GL_GREATER; break;
case D3DCMP_NOTEQUAL: glParm=GL_NOTEQUAL; break;
case D3DCMP_GREATEREQUAL: glParm=GL_GEQUAL; break;
case D3DCMP_ALWAYS: glParm=GL_ALWAYS; break;
default:
FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value);
}
TRACE("glStencilFunc with Parm=%x, ref=%d, mask=%x\n", glParm, ref, mask);
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
This->stencilfunc = glParm;
glStencilFunc(glParm, ref, mask);
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
checkGLcall("glStencilFunc");
}
break;
case D3DRS_STENCILREF :
{
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
int glParm = This->stencilfunc;
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
int ref = 0;
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
GLuint mask = This->StateBlock->renderstate[D3DRS_STENCILMASK];
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
ref = Value;
TRACE("glStencilFunc with Parm=%x, ref=%d, mask=%x\n", glParm, ref, mask);
glStencilFunc(glParm, ref, mask);
checkGLcall("glStencilFunc");
}
break;
case D3DRS_STENCILMASK :
{
Avoid the use of glGet when we know the information locally.
2003-06-05 00:02:06 +02:00
int glParm = This->stencilfunc;
int ref = This->StateBlock->renderstate[D3DRS_STENCILREF];
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
GLuint mask = Value;
TRACE("glStencilFunc with Parm=%x, ref=%d, mask=%x\n", glParm, ref, mask);
glStencilFunc(glParm, ref, mask);
checkGLcall("glStencilFunc");
}
break;
case D3DRS_STENCILFAIL :
{
GLenum fail ;
GLenum zpass ;
GLenum zfail ;
fail = StencilOp(Value);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);
checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);");
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);
checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);");
TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass);
glStencilOp(fail, zfail, zpass);
checkGLcall("glStencilOp(fail, zfail, zpass);");
}
break;
case D3DRS_STENCILZFAIL :
{
GLenum fail ;
GLenum zpass ;
GLenum zfail ;
glGetIntegerv(GL_STENCIL_FAIL, &fail);
checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);");
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);
checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);");
zfail = StencilOp(Value);
TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass);
glStencilOp(fail, zfail, zpass);
checkGLcall("glStencilOp(fail, zfail, zpass);");
}
break;
case D3DRS_STENCILPASS :
{
GLenum fail ;
GLenum zpass ;
GLenum zfail ;
glGetIntegerv(GL_STENCIL_FAIL, &fail);
checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);");
zpass = StencilOp(Value);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);
checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);");
TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass);
glStencilOp(fail, zfail, zpass);
checkGLcall("glStencilOp(fail, zfail, zpass);");
}
break;
case D3DRS_STENCILWRITEMASK :
{
glStencilMask(Value);
- Stencil mapping now works (it helps to actually allocate a stencil buffer). - Texture mapping corrected if no real texture bound. - Code now detects which opengl extensions are present - to be extended later. - More debug tracepoints.
2002-11-06 20:56:32 +01:00
TRACE("glStencilMask(%lu)\n", Value);
Beginnings of Stencil support.
2002-10-22 02:42:11 +02:00
checkGLcall("glStencilMask");
}
break;
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_FOGENABLE :
The simple bits of fog.
2002-12-17 05:14:34 +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
if (Value && This->StateBlock->renderstate[D3DRS_FOGTABLEMODE] != D3DFOG_NONE) {
The simple bits of fog.
2002-12-17 05:14:34 +01:00
glEnable(GL_FOG);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glEnable GL_FOG");
The simple bits of fog.
2002-12-17 05:14:34 +01:00
} else {
glDisable(GL_FOG);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glDisable GL_FOG");
The simple bits of fog.
2002-12-17 05:14:34 +01:00
}
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_FOGCOLOR :
The simple bits of fog.
2002-12-17 05:14:34 +01:00
{
float col[4];
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DCOLORTOGLFLOAT4(Value, col);
The simple bits of fog.
2002-12-17 05:14:34 +01:00
/* Set the default alpha blend color */
glFogfv(GL_FOG_COLOR, &col[0]);
checkGLcall("glFog GL_FOG_COLOR");
}
break;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
case D3DRS_FOGTABLEMODE :
{
switch (Value) {
case D3DFOG_NONE: /* I don't know what to do here */ break;
case D3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break;
case D3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); break;
case D3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); break;
default:
FIXME("Unsupported Value(%lu) for D3DRS_FOGTABLEMODE!\n", Value);
}
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_FOGSTART :
The simple bits of fog.
2002-12-17 05:14:34 +01:00
{
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
float *f = (float*) &Value;
The simple bits of fog.
2002-12-17 05:14:34 +01:00
glFogfv(GL_FOG_START, f);
checkGLcall("glFogf(GL_FOG_START, (float) Value)");
TRACE("Fog Start == %f\n", *f);
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_FOGEND :
The simple bits of fog.
2002-12-17 05:14:34 +01:00
{
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
float *f = (float*) &Value;
The simple bits of fog.
2002-12-17 05:14:34 +01:00
glFogfv(GL_FOG_END, f);
checkGLcall("glFogf(GL_FOG_END, (float) Value)");
TRACE("Fog End == %f\n", *f);
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_FOGDENSITY :
The simple bits of fog.
2002-12-17 05:14:34 +01:00
{
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
float *f = (float*) &Value;
glFogfv(GL_FOG_DENSITY, f);
The simple bits of fog.
2002-12-17 05:14:34 +01:00
checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)");
}
break;
- beginning of vertex matrix blending using extensions (currently alpha alpha stage as i haven't understand needed extension behavior) - modify SetRenderState for matrix blending specific params - by default diffuse color is white ;) - comments most of the traces (else flood ...) - add more urls in comments - indent, cleanups
2003-01-15 00:12:37 +01:00
case D3DRS_VERTEXBLEND :
{
This->UpdateStateBlock->vertex_blend = (D3DVERTEXBLENDFLAGS) Value;
TRACE("Vertex Blending state to %ld\n", Value);
}
break;
case D3DRS_TWEENFACTOR :
{
This->UpdateStateBlock->tween_factor = *((float*) &Value);
TRACE("Vertex Blending Tween Factor to %f\n", This->UpdateStateBlock->tween_factor);
}
break;
case D3DRS_INDEXEDVERTEXBLENDENABLE :
{
TRACE("Indexed Vertex Blend Enable to %ul\n", (BOOL) Value);
}
break;
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
case D3DRS_COLORVERTEX :
case D3DRS_DIFFUSEMATERIALSOURCE :
case D3DRS_SPECULARMATERIALSOURCE :
case D3DRS_AMBIENTMATERIALSOURCE :
case D3DRS_EMISSIVEMATERIALSOURCE :
{
GLenum Parm = GL_AMBIENT_AND_DIFFUSE;
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
if (This->StateBlock->renderstate[D3DRS_COLORVERTEX]) {
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
TRACE("diff %ld, amb %ld, emis %ld, spec %ld\n",
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
This->StateBlock->renderstate[D3DRS_DIFFUSEMATERIALSOURCE],
This->StateBlock->renderstate[D3DRS_AMBIENTMATERIALSOURCE],
This->StateBlock->renderstate[D3DRS_EMISSIVEMATERIALSOURCE],
This->StateBlock->renderstate[D3DRS_SPECULARMATERIALSOURCE]);
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +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
if (This->StateBlock->renderstate[D3DRS_DIFFUSEMATERIALSOURCE] == D3DMCS_COLOR1) {
if (This->StateBlock->renderstate[D3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) {
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
Parm = GL_AMBIENT_AND_DIFFUSE;
} else {
Parm = GL_DIFFUSE;
}
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
} else if (This->StateBlock->renderstate[D3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) {
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
Parm = GL_AMBIENT;
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
} else if (This->StateBlock->renderstate[D3DRS_EMISSIVEMATERIALSOURCE] == D3DMCS_COLOR1) {
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
Parm = GL_EMISSION;
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
} else if (This->StateBlock->renderstate[D3DRS_SPECULARMATERIALSOURCE] == D3DMCS_COLOR1) {
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
Parm = GL_SPECULAR;
} else {
Parm = -1;
}
if (Parm == -1) {
glColorMaterial enable/disable setup is only done when really necessary. If glColorMaterial is set to track current color and none is supplied, it gets disabled. glMaterial is reset when I think it is necessary. Slow mode now has defaults for when fvf parms are not supplied (as per fast mode). Slow mode now sets up the specular color (forgot that bit previously, I think!). Trace now lists the front, back and stencil buffers for ease of debugging.
2003-08-05 20:29:20 +02:00
if (This->tracking_color != DISABLED_TRACKING) This->tracking_color = NEEDS_DISABLE;
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
} else {
glColorMaterial enable/disable setup is only done when really necessary. If glColorMaterial is set to track current color and none is supplied, it gets disabled. glMaterial is reset when I think it is necessary. Slow mode now has defaults for when fvf parms are not supplied (as per fast mode). Slow mode now sets up the specular color (forgot that bit previously, I think!). Trace now lists the front, back and stencil buffers for ease of debugging.
2003-08-05 20:29:20 +02:00
This->tracking_color = NEEDS_TRACKING;
This->tracking_parm = Parm;
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
}
} else {
glColorMaterial enable/disable setup is only done when really necessary. If glColorMaterial is set to track current color and none is supplied, it gets disabled. glMaterial is reset when I think it is necessary. Slow mode now has defaults for when fvf parms are not supplied (as per fast mode). Slow mode now sets up the specular color (forgot that bit previously, I think!). Trace now lists the front, back and stencil buffers for ease of debugging.
2003-08-05 20:29:20 +02:00
if (This->tracking_color != DISABLED_TRACKING) This->tracking_color = NEEDS_DISABLE;
Add support for color material sources, with help from Lucho.
2003-01-24 01:48:10 +01:00
}
}
break;
The simple bits of fog.
2002-12-17 05:14:34 +01:00
case D3DRS_LINEPATTERN :
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
{
D3DLINEPATTERN *pattern = (D3DLINEPATTERN *)&Value;
TRACE("Line pattern: repeat %d bits %x\n", pattern->wRepeatFactor, pattern->wLinePattern);
if (pattern->wRepeatFactor) {
glLineStipple(pattern->wRepeatFactor, pattern->wLinePattern);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glLineStipple(repeat, linepattern)");
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
glEnable(GL_LINE_STIPPLE);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glEnable(GL_LINE_STIPPLE);");
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
} else {
glDisable(GL_LINE_STIPPLE);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glDisable(GL_LINE_STIPPLE);");
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
}
}
break;
case D3DRS_ZBIAS :
{
if (Value) {
TRACE("ZBias value %f\n", *((float*)&Value));
glPolygonOffset(0, -*((float*)&Value));
checkGLcall("glPolygonOffset(0, -Value)");
glEnable(GL_POLYGON_OFFSET_FILL);
checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL);");
glEnable(GL_POLYGON_OFFSET_LINE);
checkGLcall("glEnable(GL_POLYGON_OFFSET_LINE);");
glEnable(GL_POLYGON_OFFSET_POINT);
checkGLcall("glEnable(GL_POLYGON_OFFSET_POINT);");
} else {
glDisable(GL_POLYGON_OFFSET_FILL);
checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL);");
glDisable(GL_POLYGON_OFFSET_LINE);
checkGLcall("glDisable(GL_POLYGON_OFFSET_LINE);");
glDisable(GL_POLYGON_OFFSET_POINT);
checkGLcall("glDisable(GL_POLYGON_OFFSET_POINT);");
}
}
break;
case D3DRS_NORMALIZENORMALS :
if (Value) {
glEnable(GL_NORMALIZE);
checkGLcall("glEnable(GL_NORMALIZE);");
} else {
glDisable(GL_NORMALIZE);
checkGLcall("glDisable(GL_NORMALIZE);");
}
break;
case D3DRS_POINTSIZE :
TRACE("Set point size to %f\n", *((float*)&Value));
glPointSize(*((float*)&Value));
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glPointSize(...);");
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
break;
case D3DRS_POINTSIZE_MIN :
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
if (GL_SUPPORT(EXT_POINT_PARAMETERS)) {
GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, *((float*)&Value));
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glPointParameterfEXT(...);");
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
} else {
FIXME("D3DRS_POINTSIZE_MIN not supported on this opengl\n");
}
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
break;
case D3DRS_POINTSIZE_MAX :
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
if (GL_SUPPORT(EXT_POINT_PARAMETERS)) {
GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, *((float*)&Value));
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glPointParameterfEXT(...);");
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
} else {
FIXME("D3DRS_POINTSIZE_MAX not supported on this opengl\n");
}
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
break;
case D3DRS_POINTSCALE_A :
case D3DRS_POINTSCALE_B :
case D3DRS_POINTSCALE_C :
case D3DRS_POINTSCALEENABLE :
{
/* If enabled, supply the parameters, otherwise fall back to defaults */
if (This->StateBlock->renderstate[D3DRS_POINTSCALEENABLE]) {
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
GLfloat att[3] = {1.0f, 0.0f, 0.0f};
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
att[0] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_A]);
att[1] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_B]);
att[2] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_C]);
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
if (GL_SUPPORT(EXT_POINT_PARAMETERS)) {
GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);");
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
} else {
TRACE("D3DRS_POINTSCALEENABLE not supported on this opengl\n");
}
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
} else {
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
GLfloat att[3] = {1.0f, 0.0f, 0.0f};
if (GL_SUPPORT(EXT_POINT_PARAMETERS)) {
GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);");
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
} else {
TRACE("D3DRS_POINTSCALEENABLE not supported, but not on either\n");
}
}
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
break;
}
case D3DRS_COLORWRITEENABLE :
TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n",
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
Value & D3DCOLORWRITEENABLE_RED ? 1 : 0,
Value & D3DCOLORWRITEENABLE_GREEN ? 1 : 0,
Value & D3DCOLORWRITEENABLE_BLUE ? 1 : 0,
Value & D3DCOLORWRITEENABLE_ALPHA ? 1 : 0);
glColorMask(Value & D3DCOLORWRITEENABLE_RED,
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
Value & D3DCOLORWRITEENABLE_GREEN,
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
Value & D3DCOLORWRITEENABLE_BLUE,
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
Value & D3DCOLORWRITEENABLE_ALPHA);
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
checkGLcall("glColorMask(...)");
Fill in lots of unimplemented render states.
2003-06-04 22:10:43 +02:00
break;
/* Unhandled yet...! */
The simple bits of fog.
2002-12-17 05:14:34 +01:00
case D3DRS_LASTPIXEL :
case D3DRS_ZVISIBLE :
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DRS_EDGEANTIALIAS :
case D3DRS_RANGEFOGENABLE :
case D3DRS_WRAP0 :
case D3DRS_WRAP1 :
case D3DRS_WRAP2 :
case D3DRS_WRAP3 :
case D3DRS_WRAP4 :
case D3DRS_WRAP5 :
case D3DRS_WRAP6 :
case D3DRS_WRAP7 :
case D3DRS_FOGVERTEXMODE :
case D3DRS_LOCALVIEWER :
case D3DRS_SOFTWAREVERTEXPROCESSING :
case D3DRS_POINTSPRITEENABLE :
case D3DRS_MULTISAMPLEANTIALIAS :
case D3DRS_MULTISAMPLEMASK :
case D3DRS_PATCHEDGESTYLE :
case D3DRS_PATCHSEGMENTS :
case D3DRS_DEBUGMONITORTOKEN :
- 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
case D3DRS_POSITIONORDER :
case D3DRS_NORMALORDER :
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/*Put back later: FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); */
TRACE("(%p)->(%d,%ld) not handled yet\n", This, State, Value);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
break;
default:
FIXME("(%p)->(%d,%ld) unrecognized\n", This, State, Value);
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(LPDIRECT3DDEVICE8 iface, D3DRENDERSTATETYPE State,DWORD* pValue) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p) for State %d = %ld\n", This, State, This->UpdateStateBlock->renderstate[State]);
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
*pValue = This->StateBlock->renderstate[State];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_BeginStateBlock(LPDIRECT3DDEVICE8 iface) {
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
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE("(%p)\n", This);
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
return IDirect3DDeviceImpl_BeginStateBlock(This);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface, DWORD* pToken) {
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
IDirect3DStateBlockImpl* pSB;
ICOM_THIS(IDirect3DDevice8Impl,iface);
HRESULT res;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
TRACE("(%p)\n", This);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
res = IDirect3DDeviceImpl_EndStateBlock(This, &pSB);
*pToken = (DWORD) pSB;
return res;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
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
IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token;
ICOM_THIS(IDirect3DDevice8Impl,iface);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
TRACE("(%p)\n", This);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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 IDirect3DDeviceImpl_ApplyStateBlock(This, pSB);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
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
IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token;
ICOM_THIS(IDirect3DDevice8Impl,iface);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
TRACE("(%p)\n", This);
Various fixes, typos corrected and clarifying trace points.
2002-10-07 20:24:28 +02: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 IDirect3DDeviceImpl_CaptureStateBlock(This, pSB);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
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
IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token;
ICOM_THIS(IDirect3DDevice8Impl,iface);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
TRACE("(%p)\n", This);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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 IDirect3DDeviceImpl_DeleteStateBlock(This, pSB);
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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 IDirect3DDevice8Impl_CreateStateBlock(LPDIRECT3DDEVICE8 iface, D3DSTATEBLOCKTYPE Type, DWORD* pToken) {
IDirect3DStateBlockImpl* pSB;
ICOM_THIS(IDirect3DDevice8Impl,iface);
HRESULT res;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
TRACE("(%p) : for type %d\n", This, Type);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
res = IDirect3DDeviceImpl_CreateStateBlock(This, Type, &pSB);
*pToken = (DWORD) pSB;
return res;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface, CONST D3DCLIPSTATUS8* pClipStatus) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface, D3DCLIPSTATUS8* pClipStatus) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage,IDirect3DBaseTexture8** ppTexture) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
TRACE("(%p) : returning %p for stage %ld\n", This, This->UpdateStateBlock->textures[Stage], Stage);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
*ppTexture = (LPDIRECT3DBASETEXTURE8) This->UpdateStateBlock->textures[Stage];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DBaseTexture8Impl_AddRef(*ppTexture);
return D3D_OK;
}
- 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
HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage, IDirect3DBaseTexture8* pTexture) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DBaseTexture8 *oldTxt;
Don't reapply all the texture states if the texture we are replacing is the same as the texture there already and the texture is not 'dirty'.
2003-04-22 01:20:51 +02:00
BOOL reapplyStates = TRUE;
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
DWORD oldTextureDimensions = -1;
DWORD reapplyFlags = 0;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
D3DRESOURCETYPE textureType;
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
oldTxt = This->UpdateStateBlock->textures[Stage];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("(%p) : Stage(%ld), Texture (%p)\n", This, Stage, pTexture);
- 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
/* Reject invalid texture units */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Stage >= GL_LIMITS(textures)) {
- 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("Attempt to access invalid texture rejected\n");
return D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Set.textures[Stage] = TRUE;
This->UpdateStateBlock->Changed.textures[Stage] = TRUE;
This->UpdateStateBlock->textures[Stage] = pTexture;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
oldTextureDimensions = This->UpdateStateBlock->textureDimensions[Stage];
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Make appropriate texture active */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (GL_SUPPORT(ARB_MULTITEXTURE)) {
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
#if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + Stage);
#else
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
glActiveTextureARB(GL_TEXTURE0_ARB + Stage);
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
#endif
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
checkGLcall("glActiveTextureARB");
} else if (Stage>0) {
FIXME("Program using multiple concurrent textures which this opengl implementation doesnt support\n");
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Decrement the count of the previous texture */
- 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
if (NULL != oldTxt) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DBaseTexture8Impl_Release(oldTxt);
}
- 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
if (NULL != pTexture) {
IDirect3DBaseTexture8Impl_AddRef((LPDIRECT3DBASETEXTURE8) This->UpdateStateBlock->textures[Stage]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Now setup the texture appropraitly */
textureType = IDirect3DBaseTexture8Impl_GetType(pTexture);
if (textureType == D3DRTYPE_TEXTURE) {
- 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
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
Don't reapply all the texture states if the texture we are replacing is the same as the texture there already and the texture is not 'dirty'.
2003-04-22 01:20:51 +02:00
} else {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Standard 2D texture */
TRACE("Standard 2d texture\n");
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
This->UpdateStateBlock->textureDimensions[Stage] = GL_TEXTURE_2D;
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +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
/* Load up the texture now */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
IDirect3DTexture8Impl_PreLoad((LPDIRECT3DTEXTURE8) pTexture);
Don't reapply all the texture states if the texture we are replacing is the same as the texture there already and the texture is not 'dirty'.
2003-04-22 01:20:51 +02:00
}
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
} else if (textureType == D3DRTYPE_VOLUMETEXTURE) {
- 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
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
} else {
/* Standard 3D (volume) texture */
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
TRACE("Standard 3d texture\n");
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
This->UpdateStateBlock->textureDimensions[Stage] = GL_TEXTURE_3D;
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
/* Load up the texture now */
IDirect3DVolumeTexture8Impl_PreLoad((LPDIRECT3DVOLUMETEXTURE8) pTexture);
- 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
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
} else if (textureType == D3DRTYPE_CUBETEXTURE) {
- 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
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
} else {
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
/* Standard Cube texture */
TRACE("Standard Cube texture\n");
This->UpdateStateBlock->textureDimensions[Stage] = GL_TEXTURE_CUBE_MAP_ARB;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
/* Load up the texture now */
IDirect3DCubeTexture8Impl_PreLoad((LPDIRECT3DCUBETEXTURE8) pTexture);
- 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
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
} else {
FIXME("(%p) : Incorrect type for a texture : (%d,%s)\n", This, textureType, debug_d3dressourcetype(textureType));
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
} else {
TRACE("Setting to no texture (ie default texture)\n");
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
This->UpdateStateBlock->textureDimensions[Stage] = GL_TEXTURE_1D;
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
glBindTexture(GL_TEXTURE_1D, This->dummyTextureName[Stage]);
checkGLcall("glBindTexture");
TRACE("Bound dummy Texture to stage %ld (gl name %d)\n", Stage, This->dummyTextureName[Stage]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
/* Disable the old texture binding and enable the new one (unless operations are disabled) */
if (oldTextureDimensions != This->UpdateStateBlock->textureDimensions[Stage]) {
glDisable(oldTextureDimensions);
checkGLcall("Disable oldTextureDimensions");
if (This->StateBlock->texture_state[Stage][D3DTSS_COLOROP] != D3DTOP_DISABLE) {
glEnable(This->UpdateStateBlock->textureDimensions[Stage]);
checkGLcall("Disable new texture dimensions");
}
/* If Alpha arg1 is texture then handle the special case when there changes between a
texture and no texture - See comments in set_tex_op */
if ((This->StateBlock->texture_state[Stage][D3DTSS_ALPHAARG1] == D3DTA_TEXTURE) &&
DXT1/3/5 support was broken, but unnoticeable since we also indicated it wasn't supported.
2003-08-15 05:50:08 +02:00
(((oldTxt == NULL) && (pTexture != NULL)) || ((pTexture == NULL) && (oldTxt != NULL))))
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
{
reapplyFlags |= REAPPLY_ALPHAOP;
}
}
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/* Even if the texture has been set to null, reapply the stages as a null texture to directx requires
a dummy texture in opengl, and we always need to ensure the current view of the TextureStates apply */
Don't reapply all the texture states if the texture we are replacing is the same as the texture there already and the texture is not 'dirty'.
2003-04-22 01:20:51 +02:00
if (reapplyStates) {
Only reapply the texture states necessary when a different texture gets bound to the same texture unit.
2003-08-05 21:18:58 +02:00
setupTextureStates(iface, Stage, reapplyFlags);
Don't reapply all the texture states if the texture we are replacing is the same as the texture there already and the texture is not 'dirty'.
2003-04-22 01:20:51 +02:00
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
TRACE("(%p) : requesting Stage %ld, Type %d getting %ld\n", This, Stage, Type, This->UpdateStateBlock->texture_state[Stage][Type]);
*pValue = This->UpdateStateBlock->texture_state[Stage][Type];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
Add the basic support for volume textures / volumes (3d textures).
2002-10-21 20:21:59 +02:00
/* FIXME: Handle 3d textures? What if TSS value set before set texture? Need to reapply all values? */
Fix the texture operations to resolve glitches shown in UT2003 when get quad damage. checkGLcall must not supply a \n as that is supplied by its expansion. Performance fixes to save applying the same states 6 times and to reduce function calls when accessing front/back buffers. Make traces more readable by more constants -> english descriptions.
2003-06-13 21:14:34 +02:00
TRACE("(%p) : Stage=%ld, Type=%s(%d), Value=%ld\n", This, Stage, debug_d3dtexturestate(Type), Type, Value);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
/* Reject invalid texture units */
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (Stage >= GL_LIMITS(textures)) {
- 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("Attempt to access invalid texture rejected\n");
return D3DERR_INVALIDCALL;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Changed.texture_state[Stage][Type] = TRUE;
This->UpdateStateBlock->Set.texture_state[Stage][Type] = TRUE;
This->UpdateStateBlock->texture_state[Stage][Type] = Value;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Make appropriate texture active */
- Disable some 'classic' debug traces (avoid useless flood of traces while debugging games). - Fix the texture size caps using GL_MAX_TEXTURE_SIZE.
2003-05-08 19:36:00 +02:00
VTRACE(("Activating appropriate texture state %ld\n", Stage));
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (GL_SUPPORT(ARB_MULTITEXTURE)) {
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
#if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + Stage);
- Disable some 'classic' debug traces (avoid useless flood of traces while debugging games). - Fix the texture size caps using GL_MAX_TEXTURE_SIZE.
2003-05-08 19:36:00 +02:00
vcheckGLcall("glActiveTexture");
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
#else
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
glActiveTextureARB(GL_TEXTURE0_ARB + Stage);
- Disable some 'classic' debug traces (avoid useless flood of traces while debugging games). - Fix the texture size caps using GL_MAX_TEXTURE_SIZE.
2003-05-08 19:36:00 +02:00
vcheckGLcall("glActiveTextureARB");
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
#endif
- Disable some 'classic' debug traces (avoid useless flood of traces while debugging games). - Fix the texture size caps using GL_MAX_TEXTURE_SIZE.
2003-05-08 19:36:00 +02:00
} else if (Stage > 0) {
Query opengl to ensure it supports multitexture, and honour the number of supported texture units. Especially important for NVidia drivers which only support 2 texture units.
2002-12-23 02:34:59 +01:00
FIXME("Program using multiple concurrent textures which this opengl implementation doesnt support\n");
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
switch (Type) {
case D3DTSS_MINFILTER :
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
case D3DTSS_MIPFILTER :
{
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
DWORD ValueMIN = This->StateBlock->texture_state[Stage][D3DTSS_MINFILTER];
DWORD ValueMIP = This->StateBlock->texture_state[Stage][D3DTSS_MIPFILTER];
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
GLint realVal = GL_LINEAR;
if (ValueMIN == D3DTEXF_POINT) {
/* GL_NEAREST_* */
if (ValueMIP == D3DTEXF_POINT) {
realVal = GL_NEAREST_MIPMAP_NEAREST;
} else if (ValueMIP == D3DTEXF_LINEAR) {
realVal = GL_NEAREST_MIPMAP_LINEAR;
} else if (ValueMIP == D3DTEXF_NONE) {
realVal = GL_NEAREST;
} else {
FIXME("Unhandled D3DTSS_MIPFILTER value of %ld\n", ValueMIP);
realVal = GL_NEAREST_MIPMAP_LINEAR;
}
} else if (ValueMIN == D3DTEXF_LINEAR) {
/* GL_LINEAR_* */
if (ValueMIP == D3DTEXF_POINT) {
realVal = GL_LINEAR_MIPMAP_NEAREST;
} else if (ValueMIP == D3DTEXF_LINEAR) {
realVal = GL_LINEAR_MIPMAP_LINEAR;
} else if (ValueMIP == D3DTEXF_NONE) {
realVal = GL_LINEAR;
} else {
FIXME("Unhandled D3DTSS_MIPFILTER value of %ld\n", ValueMIP);
realVal = GL_LINEAR_MIPMAP_LINEAR;
}
} else if (ValueMIN == D3DTEXF_NONE) {
/* Doesnt really make sense - Windows just seems to disable
mipmapping when this occurs */
FIXME("Odd - minfilter of none, just disabling mipmaps\n");
realVal = GL_LINEAR;
} else {
FIXME("Unhandled D3DTSS_MINFILTER value of %ld\n", ValueMIN);
realVal = GL_LINEAR_MIPMAP_LINEAR;
}
TRACE("ValueMIN=%ld, ValueMIP=%ld, setting MINFILTER to %x\n", ValueMIN, ValueMIP, realVal);
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
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_MIN_FILTER, realVal);
Added basic support for mipmaping, verified using sample from codesampler.com.
2003-01-03 22:28:05 +01:00
checkGLcall("glTexParameter GL_TEXTURE_MINFILTER, ...");
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
break;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
case D3DTSS_MAXANISOTROPY :
{
if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) {
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_MAX_ANISOTROPY_EXT, This->StateBlock->texture_state[Stage][D3DTSS_MAXANISOTROPY]);
checkGLcall("glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT ...");
}
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DTSS_MAGFILTER :
if (Value == D3DTEXF_POINT) {
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
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_MAG_FILTER, GL_NEAREST);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glTexParameter GL_TEXTURE_MAGFILTER, GL_NEAREST");
} else if (Value == D3DTEXF_LINEAR) {
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
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_MAG_FILTER, GL_LINEAR);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
checkGLcall("glTexParameter GL_TEXTURE_MAGFILTER, GL_LINEAR");
} else {
FIXME("Unhandled D3DTSS_MAGFILTER value of %ld\n", Value);
}
break;
case D3DTSS_ALPHAOP :
case D3DTSS_COLOROP :
{
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
if ((Value == D3DTOP_DISABLE) && (Type == D3DTSS_COLOROP)) {
- Dont set lighting during draw primitive, rely on the render state. - Small fix for alpha testing. - Add support to enable/disable clipping as a whole. - Allow D3DRS_TEXTUREFACTOR to be changed once texture stage arg set up. - D3DTOP_DISABLE initial implementation.
2002-10-17 03:21:43 +02:00
/* TODO: Disable by making this and all later levels disabled */
Implement UpdateTexture for 2D textures only. Handle alphaop disabled but color op not-disable in a more appropriate way (Docs say this is an illegal state and then proceed to use it). Trace out textures as they are created. Update the comments around the debug code and complete the debugging set so textures which are used in the game can also be viewed.
2003-07-03 20:10:22 +02:00
glDisable(GL_TEXTURE_1D);
checkGLcall("Disable GL_TEXTURE_1D");
glDisable(GL_TEXTURE_2D);
checkGLcall("Disable GL_TEXTURE_2D");
glDisable(GL_TEXTURE_3D);
checkGLcall("Disable GL_TEXTURE_3D");
Add support for a lot of the remaining texture ops, move code into the utils module, and clean up the main code path.
2003-06-05 00:20:47 +02:00
break; /* Dont bother setting the texture operations */
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
} else {
/* Enable only the appropriate texture dimension */
- Disable some 'classic' debug traces (avoid useless flood of traces while debugging games). - Fix the texture size caps using GL_MAX_TEXTURE_SIZE.
2003-05-08 19:36:00 +02:00
if (Type == D3DTSS_COLOROP) {
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
if (This->StateBlock->textureDimensions[Stage] == GL_TEXTURE_1D) {
- Stencil mapping now works (it helps to actually allocate a stencil buffer). - Texture mapping corrected if no real texture bound. - Code now detects which opengl extensions are present - to be extended later. - More debug tracepoints.
2002-11-06 20:56:32 +01:00
glEnable(GL_TEXTURE_1D);
checkGLcall("Enable GL_TEXTURE_1D");
} else {
glDisable(GL_TEXTURE_1D);
checkGLcall("Disable GL_TEXTURE_1D");
}
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
if (This->StateBlock->textureDimensions[Stage] == GL_TEXTURE_2D) {
- Stencil mapping now works (it helps to actually allocate a stencil buffer). - Texture mapping corrected if no real texture bound. - Code now detects which opengl extensions are present - to be extended later. - More debug tracepoints.
2002-11-06 20:56:32 +01:00
glEnable(GL_TEXTURE_2D);
checkGLcall("Enable GL_TEXTURE_2D");
} else {
glDisable(GL_TEXTURE_2D);
checkGLcall("Disable GL_TEXTURE_2D");
}
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
if (This->StateBlock->textureDimensions[Stage] == GL_TEXTURE_3D) {
- Stencil mapping now works (it helps to actually allocate a stencil buffer). - Texture mapping corrected if no real texture bound. - Code now detects which opengl extensions are present - to be extended later. - More debug tracepoints.
2002-11-06 20:56:32 +01:00
glEnable(GL_TEXTURE_3D);
checkGLcall("Enable GL_TEXTURE_3D");
} else {
glDisable(GL_TEXTURE_3D);
checkGLcall("Disable GL_TEXTURE_3D");
}
- 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
if (This->StateBlock->textureDimensions[Stage] == GL_TEXTURE_CUBE_MAP_ARB) {
glEnable(GL_TEXTURE_CUBE_MAP_ARB);
checkGLcall("Enable GL_TEXTURE_CUBE_MAP");
} else {
glDisable(GL_TEXTURE_CUBE_MAP_ARB);
checkGLcall("Disable GL_TEXTURE_CUBE_MAP");
}
Restore the texture env mode on SetTexture - Fixes problem in codesampler demo.
2003-01-21 01:30:27 +01:00
}
Add support for a lot of the remaining texture ops, move code into the utils module, and clean up the main code path.
2003-06-05 00:20:47 +02:00
}
/* Drop through... (Except disable case) */
case D3DTSS_COLORARG0 :
case D3DTSS_COLORARG1 :
case D3DTSS_COLORARG2 :
case D3DTSS_ALPHAARG0 :
case D3DTSS_ALPHAARG1 :
case D3DTSS_ALPHAARG2 :
{
BOOL isAlphaArg = (Type == D3DTSS_ALPHAOP || Type == D3DTSS_ALPHAARG1 ||
Type == D3DTSS_ALPHAARG2 || Type == D3DTSS_ALPHAARG0);
if (isAlphaArg) {
set_tex_op(iface, TRUE, Stage, This->StateBlock->texture_state[Stage][D3DTSS_ALPHAOP],
This->StateBlock->texture_state[Stage][D3DTSS_ALPHAARG1],
This->StateBlock->texture_state[Stage][D3DTSS_ALPHAARG2],
This->StateBlock->texture_state[Stage][D3DTSS_ALPHAARG0]);
} else {
set_tex_op(iface, FALSE, Stage, This->StateBlock->texture_state[Stage][D3DTSS_COLOROP],
This->StateBlock->texture_state[Stage][D3DTSS_COLORARG1],
This->StateBlock->texture_state[Stage][D3DTSS_COLORARG2],
This->StateBlock->texture_state[Stage][D3DTSS_COLORARG0]);
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
break;
}
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
case D3DTSS_ADDRESSU :
case D3DTSS_ADDRESSV :
case D3DTSS_ADDRESSW :
{
GLint wrapParm = GL_REPEAT;
switch (Value) {
case D3DTADDRESS_WRAP: wrapParm = GL_REPEAT; break;
Make codesampler texture addressing mode sample work better. Add mirrorsupport (if opengl 1.3) and make clamp and border appear more similar to Windows.
2003-04-19 22:08:14 +02:00
case D3DTADDRESS_CLAMP: wrapParm = GL_CLAMP_TO_EDGE; break;
case D3DTADDRESS_BORDER: wrapParm = GL_REPEAT; break; /* FIXME: Not right, but better */
MIRROR_ARB support is not dependent on OpenGL 1.3 as I originally ifdef'ed. It is apparently introduced fully in 1.4, or dependent on another ifdef, GL_ARB_texture_mirrored_repeat.
2003-04-22 01:29:39 +02:00
#if defined(GL_VERSION_1_4)
case D3DTADDRESS_MIRROR: wrapParm = GL_MIRRORED_REPEAT; break;
#elif defined(GL_ARB_texture_mirrored_repeat)
Make codesampler texture addressing mode sample work better. Add mirrorsupport (if opengl 1.3) and make clamp and border appear more similar to Windows.
2003-04-19 22:08:14 +02:00
case D3DTADDRESS_MIRROR: wrapParm = GL_MIRRORED_REPEAT_ARB; break;
#else
case D3DTADDRESS_MIRROR: /* Unsupported in OpenGL pre-1.4 */
#endif
MIRROR_ARB support is not dependent on OpenGL 1.3 as I originally ifdef'ed. It is apparently introduced fully in 1.4, or dependent on another ifdef, GL_ARB_texture_mirrored_repeat.
2003-04-22 01:29:39 +02:00
case D3DTADDRESS_MIRRORONCE: /* Unsupported in OpenGL */
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
default:
FIXME("Unrecognized or unsupported D3DTADDRESS_* value %ld, state %d\n", Value, Type);
wrapParm = GL_REPEAT;
}
switch (Type) {
case D3DTSS_ADDRESSU:
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
TRACE("Setting WRAP_S to %d for %x\n", wrapParm, This->StateBlock->textureDimensions[Stage]);
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_WRAP_S, wrapParm);
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
checkGLcall("glTexParameteri(..., GL_TEXTURE_WRAP_S, wrapParm)");
break;
case D3DTSS_ADDRESSV:
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
TRACE("Setting WRAP_T to %d for %x\n", wrapParm, This->StateBlock->textureDimensions[Stage]);
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_WRAP_T, wrapParm);
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
checkGLcall("glTexParameteri(..., GL_TEXTURE_WRAP_T, wrapParm)");
break;
case D3DTSS_ADDRESSW:
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
TRACE("Setting WRAP_R to %d for %x\n", wrapParm, This->StateBlock->textureDimensions[Stage]);
glTexParameteri(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_WRAP_R, wrapParm);
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
checkGLcall("glTexParameteri(..., GL_TEXTURE_WRAP_R, wrapParm)");
break;
default: /* nop */
break; /** stupic compilator */
}
}
break;
case D3DTSS_BORDERCOLOR :
{
float col[4];
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
D3DCOLORTOGLFLOAT4(Value, col);
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
TRACE("Setting border color for %x to %lx\n", This->StateBlock->textureDimensions[Stage], Value);
glTexParameterfv(This->StateBlock->textureDimensions[Stage], GL_TEXTURE_BORDER_COLOR, &col[0]);
Add support for some of the texture address states and border colour.
2003-01-14 23:50:00 +01:00
checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)");
}
break;
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
case D3DTSS_TEXCOORDINDEX :
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
{
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
/* Values 0-7 are indexes into the FVF tex coords - See comments in DrawPrimitive */
Implement texture transform flags the best we can for now.
2003-05-16 22:11:14 +02:00
/* FIXME: From MSDN: The D3DTSS_TCI_* flags are mutually exclusive. If you include
one flag, you can still specify an index value, which the system uses to
determine the texture wrapping mode.
eg. SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION | 1 );
means use the vertex position (camera-space) as the input texture coordinates
for this texture stage, and the wrap mode set in the D3DRS_WRAP1 render
state. We do not (yet) support the D3DRENDERSTATE_WRAPx values, nor tie them up
to the TEXCOORDINDEX value */
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
/**
* Be careful the value of the mask 0xF0000 come from d3d8types.h infos
*/
- 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
switch (Value & 0xFFFF0000) {
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
case D3DTSS_TCI_PASSTHRU:
/*Use the specified texture coordinates contained within the vertex format. This value resolves to zero.*/
- 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
glDisable(GL_TEXTURE_GEN_S);
glDisable(GL_TEXTURE_GEN_T);
glDisable(GL_TEXTURE_GEN_R);
DXT1/3/5 support was broken, but unnoticeable since we also indicated it wasn't supported.
2003-08-15 05:50:08 +02:00
checkGLcall("glDisable(GL_TEXTURE_GEN_S,T,R)");
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
break;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
case D3DTSS_TCI_CAMERASPACEPOSITION:
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
/* CameraSpacePosition means use the vertex position, transformed to camera space,
as the input texture coordinates for this stage's texture transformation. This
equates roughly to EYE_LINEAR */
{
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
float s_plane[] = { 1.0, 0.0, 0.0, 0.0 };
float t_plane[] = { 0.0, 1.0, 0.0, 0.0 };
float r_plane[] = { 0.0, 0.0, 1.0, 0.0 };
float q_plane[] = { 0.0, 0.0, 0.0, 1.0 };
TRACE("D3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane\n");
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glTexGenfv(GL_S, GL_EYE_PLANE, s_plane);
glTexGenfv(GL_T, GL_EYE_PLANE, t_plane);
glTexGenfv(GL_R, GL_EYE_PLANE, r_plane);
glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane);
glPopMatrix();
TRACE("D3DTSS_TCI_CAMERASPACEPOSITION - Set GL_TEXTURE_GEN_x and GL_x, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR\n");
glEnable(GL_TEXTURE_GEN_S);
checkGLcall("glEnable(GL_TEXTURE_GEN_S);");
glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)");
glEnable(GL_TEXTURE_GEN_T);
checkGLcall("glEnable(GL_TEXTURE_GEN_T);");
glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)");
glEnable(GL_TEXTURE_GEN_R);
checkGLcall("glEnable(GL_TEXTURE_GEN_R);");
glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)");
}
break;
- 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
#if defined(GL_ARB_texture_cube_map) || defined(GL_NV_texgen_reflection)
case D3DTSS_TCI_CAMERASPACENORMAL:
{
float s_plane[] = { 1.0, 0.0, 0.0, 0.0 };
float t_plane[] = { 0.0, 1.0, 0.0, 0.0 };
float r_plane[] = { 0.0, 0.0, 1.0, 0.0 };
float q_plane[] = { 0.0, 0.0, 0.0, 1.0 };
TRACE("D3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane\n");
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glTexGenfv(GL_S, GL_EYE_PLANE, s_plane);
glTexGenfv(GL_T, GL_EYE_PLANE, t_plane);
glTexGenfv(GL_R, GL_EYE_PLANE, r_plane);
glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane);
glPopMatrix();
glEnable(GL_TEXTURE_GEN_S);
checkGLcall("glEnable(GL_TEXTURE_GEN_S);");
glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB)");
glEnable(GL_TEXTURE_GEN_T);
checkGLcall("glEnable(GL_TEXTURE_GEN_T);");
glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB)");
glEnable(GL_TEXTURE_GEN_R);
checkGLcall("glEnable(GL_TEXTURE_GEN_R);");
glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB)");
}
break;
#endif
#if defined(GL_ARB_texture_cube_map) || defined(GL_NV_texgen_reflection)
case D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR:
{
float s_plane[] = { 1.0, 0.0, 0.0, 0.0 };
float t_plane[] = { 0.0, 1.0, 0.0, 0.0 };
float r_plane[] = { 0.0, 0.0, 1.0, 0.0 };
float q_plane[] = { 0.0, 0.0, 0.0, 1.0 };
TRACE("D3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane\n");
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glTexGenfv(GL_S, GL_EYE_PLANE, s_plane);
glTexGenfv(GL_T, GL_EYE_PLANE, t_plane);
glTexGenfv(GL_R, GL_EYE_PLANE, r_plane);
glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane);
glPopMatrix();
glEnable(GL_TEXTURE_GEN_S);
checkGLcall("glEnable(GL_TEXTURE_GEN_S);");
glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB)");
glEnable(GL_TEXTURE_GEN_T);
checkGLcall("glEnable(GL_TEXTURE_GEN_T);");
glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB)");
glEnable(GL_TEXTURE_GEN_R);
checkGLcall("glEnable(GL_TEXTURE_GEN_R);");
glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB)");
}
break;
#endif
Implement texture transform flags the best we can for now.
2003-05-16 22:11:14 +02:00
/* Unhandled types: */
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
default:
/* Todo: */
- 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
/* ? disable GL_TEXTURE_GEN_n ? */
glDisable(GL_TEXTURE_GEN_S);
glDisable(GL_TEXTURE_GEN_T);
glDisable(GL_TEXTURE_GEN_R);
Properly support texture coordinate indexes.
2003-05-14 01:51:58 +02:00
FIXME("Unhandled D3DTSS_TEXCOORDINDEX %lx\n", Value);
break;
}
Add the beginnings of support for texture coordinates.
2003-05-06 02:15:49 +02:00
}
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Unhandled */
case D3DTSS_BUMPENVMAT00 :
case D3DTSS_BUMPENVMAT01 :
Implement texture transform flags the best we can for now.
2003-05-16 22:11:14 +02:00
TRACE("BUMPENVMAT0%u Still a stub, Stage=%ld, Type=%d, Value =%ld\n", Type - D3DTSS_BUMPENVMAT00, Stage, Type, Value);
break;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DTSS_BUMPENVMAT10 :
case D3DTSS_BUMPENVMAT11 :
Implement texture transform flags the best we can for now.
2003-05-16 22:11:14 +02:00
TRACE("BUMPENVMAT1%u Still a stub, Stage=%ld, Type=%d, Value =%ld\n", Type - D3DTSS_BUMPENVMAT10, Stage, Type, Value);
break;
case D3DTSS_TEXTURETRANSFORMFLAGS :
Add fps debug channel, so we can see how the d3d code is performing and their impact of performance changes. SetTransform almost rewritten in a much neater way, and in coordination with drawprim it significantly reduces the number of times that we reload the matrixes.
2003-07-19 05:02:42 +02:00
set_texture_matrix((float *)&This->StateBlock->transforms[D3DTS_TEXTURE0 + Stage].u.m[0][0], Value);
Implement texture transform flags the best we can for now.
2003-05-16 22:11:14 +02:00
break;
- minor COM fixes (fixes some crashes on stupid games) - minor indentation changes - fix SELECTARG2 behavior (with help from Lionel Ulmer) - surface locking/unlocking (only rendering and textures surfaces supported now) - beginning of Target/Front surface support - try to get D3DTOP_SELECTARG_* working - implemented D3DTOP_SUBTRACT: currently only if OpenGL1.3 is used, we have to use GL_SUBTRACT_ARB for other versions
2003-05-11 05:35:27 +02:00
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
case D3DTSS_MIPMAPLODBIAS :
case D3DTSS_MAXMIPLEVEL :
case D3DTSS_BUMPENVLSCALE :
case D3DTSS_BUMPENVLOFFSET :
case D3DTSS_RESULTARG :
default:
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/* Put back later: FIXME("(%p) : stub, Stage=%ld, Type=%d, Value =%ld\n", This, Stage, Type, Value); */
TRACE("Still a stub, Stage=%ld, Type=%d, Value =%ld\n", Stage, Type, Value);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_ValidateDevice(LPDIRECT3DDEVICE8 iface, DWORD* pNumPasses) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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) : stub\n", This); /* FIXME: Needs doing, but called often and is harmless */
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- 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
HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(LPDIRECT3DDEVICE8 iface, DWORD DevInfoID, void* pDevInfoStruct, DWORD DevInfoStructSize) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
FIXME("(%p) : stub\n", This);
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- 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
HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
FIXME("(%p) : setting p[%u] <= RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber,
pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags);
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
memcpy(This->palettes[PaletteNumber], pEntries, 256 * sizeof(PALETTEENTRY));
- 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
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- 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
HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
memcpy(pEntries, This->palettes[PaletteNumber], 256 * sizeof(PALETTEENTRY));
- 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
FIXME("(%p) : returning p[%u] => RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber,
pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags);
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
FIXME("(%p) : Setting to (%u)\n", This, PaletteNumber);
This->currentPalette = PaletteNumber;
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
- 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
#if defined(GL_EXT_paletted_texture)
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
if (GL_SUPPORT(EXT_PALETTED_TEXTURE)) {
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
- add a new private header d3dcore_gl.h that declares needed opengl defines and the caps defines - cleanup of device.c using the caps defines (avoid the #ifdef nigthmare) - add {Set,Get}GammaRamp support
2003-06-05 01:01:49 +02:00
GL_EXTCALL(glColorTableEXT)(GL_TEXTURE_2D, /* target */
GL_RGBA, /* internal format */
256, /* table size */
GL_RGBA, /* table format */
GL_UNSIGNED_BYTE, /* table type */
This->palettes[PaletteNumber]);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
checkGLcall("glColorTableEXT");
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
} else {
/* Delayed palette handling ... waiting for software emulation into preload code */
}
- 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
#endif
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT *PaletteNumber) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
*PaletteNumber = This->currentPalette;
FIXME("(%p) : Returning (%u)\n", This, *PaletteNumber);
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
- 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
HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
This->StateBlock->streamIsUP = FALSE;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- 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
TRACE("(%p) : Type=(%d,%s), Start=%d, Count=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), StartVertex, PrimitiveCount);
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
drawPrimitive(iface, PrimitiveType, PrimitiveCount, StartVertex, -1, 0, NULL, 0);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType,
UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) {
UINT idxStride = 2;
IDirect3DIndexBuffer8 *pIB;
D3DINDEXBUFFER_DESC IdxBufDsc;
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
pIB = This->StateBlock->pIndexData;
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
This->StateBlock->streamIsUP = FALSE;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
- 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
TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d \n", This,
PrimitiveType, debug_d3dprimitivetype(PrimitiveType),
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
minIndex, NumVertices, startIndex, primCount);
IDirect3DIndexBuffer8Impl_GetDesc(pIB, &IdxBufDsc);
if (IdxBufDsc.Format == D3DFMT_INDEX16) {
idxStride = 2;
} else {
idxStride = 4;
}
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
drawPrimitive(iface, PrimitiveType, primCount, This->StateBlock->baseVertexIndex, startIndex, idxStride, ((IDirect3DIndexBuffer8Impl *) pIB)->allocatedMemory,
- Use faster vertex arrays (rather than processing vertexes one by one), whenever possible. - Less trace in the slower form by default.
2003-01-03 22:25:42 +01:00
minIndex);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
TRACE("(%p) : Type=(%d,%s), pCount=%d, pVtxData=%p, Stride=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType),
PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
if (This->StateBlock->stream_source[0] != NULL) IDirect3DVertexBuffer8Impl_Release(This->StateBlock->stream_source[0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
/* Note in the following, its not this type, but thats the purpose of streamIsUP */
This->StateBlock->stream_source[0] = (IDirect3DVertexBuffer8 *)pVertexStreamZeroData;
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
This->StateBlock->stream_stride[0] = VertexStreamZeroStride;
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
This->StateBlock->streamIsUP = TRUE;
drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, NULL, 0);
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
This->StateBlock->stream_stride[0] = 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
This->StateBlock->stream_source[0] = NULL;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/*stream zero settings set to null at end */
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,
UINT NumVertexIndices,UINT PrimitiveCount,CONST void* pIndexData,
D3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData,
UINT VertexStreamZeroStride) {
int idxStride;
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
TRACE("(%p) : Type=(%d,%s), MinVtxIdx=%d, NumVIdx=%d, PCount=%d, pidxdata=%p, IdxFmt=%d, pVtxdata=%p, stride=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType),
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
MinVertexIndex, NumVertexIndices, PrimitiveCount, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride);
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
if (This->StateBlock->stream_source[0] != NULL) IDirect3DVertexBuffer8Impl_Release(This->StateBlock->stream_source[0]);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
if (IndexDataFormat == D3DFMT_INDEX16) {
idxStride = 2;
} else {
idxStride = 4;
}
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
/* Note in the following, its not this type, but thats the purpose of streamIsUP */
This->StateBlock->stream_source[0] = (IDirect3DVertexBuffer8 *)pVertexStreamZeroData;
This->StateBlock->streamIsUP = 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
This->StateBlock->stream_stride[0] = VertexStreamZeroStride;
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
drawPrimitive(iface, PrimitiveType, PrimitiveCount, This->StateBlock->baseVertexIndex, 0, idxStride, pIndexData, MinVertexIndex);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/*stream zero settings set to null at end */
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
This->StateBlock->stream_source[0] = 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
This->StateBlock->stream_stride[0] = 0;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DDevice8Impl_SetIndices(iface, NULL, 0);
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 iface, UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); 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
HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pDeclaration, CONST DWORD* pFunction, DWORD* pHandle, DWORD Usage) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
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* object;
IDirect3DVertexShaderDeclarationImpl* attached_decl;
HRESULT res;
- 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
UINT i;
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
TRACE_(d3d_shader)("(%p) : VertexShader not fully supported yet : Decl=%p, Func=%p, Usage=%lu\n", This, pDeclaration, pFunction, Usage);
- 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
if (NULL == pDeclaration || NULL == pHandle) { /* pFunction can be NULL see MSDN */
return D3DERR_INVALIDCALL;
}
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
for (i = 1; NULL != VertexShaders[i] && i < sizeof(VertexShaders) / sizeof(IDirect3DVertexShaderImpl*); ++i) ;
if (i >= sizeof(VertexShaders) / sizeof(IDirect3DVertexShaderImpl*)) {
- 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 D3DERR_OUTOFVIDEOMEMORY;
}
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
/** Create the Vertex Shader */
res = IDirect3DDeviceImpl_CreateVertexShader(This, pFunction, Usage, &object);
/** TODO: check FAILED(res) */
/** Create and Bind the Vertex Shader Declaration */
res = IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(This, pDeclaration, &attached_decl);
/** TODO: check FAILED(res) */
- 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
VertexShaders[i] = object;
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
VertexShaderDeclarations[i] = attached_decl;
- 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
*pHandle = VS_HIGHESTFIXEDFXF + i;
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("Finished creating vertex shader %lx\n", *pHandle);
- 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 D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
This->UpdateStateBlock->VertexShader = Handle;
This->UpdateStateBlock->Changed.vertexShader = TRUE;
This->UpdateStateBlock->Set.vertexShader = 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
if (Handle > VS_HIGHESTFIXEDFXF) { /* only valid with non FVF shaders */
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : Created shader, Handle=%lx\n", This, Handle);
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
This->UpdateStateBlock->vertexShaderDecl = VERTEX_SHADER_DECL(Handle);
This->UpdateStateBlock->Changed.vertexShaderDecl = TRUE;
This->UpdateStateBlock->Set.vertexShaderDecl = TRUE;
} else { /* use a fvf, so desactivate the vshader decl */
TRACE("(%p) : FVF Shader, Handle=%lx\n", This, Handle);
This->UpdateStateBlock->vertexShaderDecl = NULL;
This->UpdateStateBlock->Changed.vertexShaderDecl = TRUE;
This->UpdateStateBlock->Set.vertexShaderDecl = TRUE;
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* Handle recording of state blocks */
if (This->isRecordingState) {
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
TRACE("Recording... not performing anything\n");
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
/**
* TODO: merge HAL shaders context switching from prototype
*/
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD* pHandle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : GetVertexShader returning %ld\n", This, This->StateBlock->VertexShader);
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
*pHandle = This->StateBlock->VertexShader;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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* object;
IDirect3DVertexShaderDeclarationImpl* attached_decl;
- 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
if (Handle <= VS_HIGHESTFIXEDFXF) { /* only delete user defined shaders */
return D3DERR_INVALIDCALL;
}
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
/**
* Delete Vertex 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
object = VertexShaders[Handle - VS_HIGHESTFIXEDFXF];
- 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 (NULL == object) {
return D3DERR_INVALIDCALL;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : freing VertexShader %p\n", This, object);
- 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
/* TODO: check validity of object */
- 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 (NULL != object->function) HeapFree(GetProcessHeap(), 0, (void *)object->function);
HeapFree(GetProcessHeap(), 0, (void *)object->data);
- 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
HeapFree(GetProcessHeap(), 0, (void *)object);
- 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
VertexShaders[Handle - VS_HIGHESTFIXEDFXF] = 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
/**
* Delete Vertex Shader Declaration
*/
attached_decl = VertexShaderDeclarations[Handle - VS_HIGHESTFIXEDFXF];
if (NULL == attached_decl) {
return D3DERR_INVALIDCALL;
}
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : freing VertexShaderDeclaration %p\n", This, attached_decl);
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
/* TODO: check validity of object */
HeapFree(GetProcessHeap(), 0, (void *)attached_decl->pDeclaration8);
HeapFree(GetProcessHeap(), 0, (void *)attached_decl);
VertexShaderDeclarations[Handle - VS_HIGHESTFIXEDFXF] = NULL;
- 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 D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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 (Register + ConstantCount > D3D8_VSHADER_MAX_CONSTANTS) {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
ERR_(d3d_shader)("(%p) : SetVertexShaderConstant C[%lu] invalid\n", This, Register);
- 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 D3DERR_INVALIDCALL;
}
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
if (NULL == pConstantData) {
- 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 D3DERR_INVALIDCALL;
}
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
if (ConstantCount > 1) {
FLOAT* f = (FLOAT*)pConstantData;
UINT i;
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : SetVertexShaderConstant C[%lu..%lu]=\n", This, Register, Register + ConstantCount - 1);
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
for (i = 0; i < ConstantCount; ++i) {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("{%f, %f, %f, %f}\n", f[0], f[1], f[2], f[3]);
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
f += 4;
}
} else {
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
FLOAT* f = (FLOAT*) pConstantData;
TRACE_(d3d_shader)("(%p) : SetVertexShaderConstant, C[%lu]={%f, %f, %f, %f}\n", This, Register, f[0], f[1], f[2], f[3]);
- 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
}
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
This->UpdateStateBlock->Changed.vertexShaderConstant = TRUE;
memcpy(&This->UpdateStateBlock->vertexShaderConstant[Register], pConstantData, ConstantCount * 4 * sizeof(FLOAT));
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- declare a new debug chanel for vertex shaders - some useful debug functions for textures format - correct DrawPrimitive (RHW correctness and vshader RHW) - more copyrects fixes (only two unimplemented behavior remain) - fix GetFrontBuffer to get screenshots samples working - add D3DCOLORTOGLFLOAT4 and use it - first try of D3DRS_FOGTABLEMODE support
2003-05-14 21:33:35 +02:00
TRACE_(d3d_shader)("(%p) : C[%lu] count=%ld\n", This, Register, ConstantCount);
- 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 (Register + ConstantCount > D3D8_VSHADER_MAX_CONSTANTS) {
- 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 D3DERR_INVALIDCALL;
}
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
if (NULL == pConstantData) {
- 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 D3DERR_INVALIDCALL;
}
- Defer of IDirect3DVertexShader_SetConstant, waiting for DrawPrimitive call. - Beginning of VertexShader constants support into stateblock (only stored, not captured yet). - Fix compiation with nivdia GL/gl.h and mesa Gl/glext headers as reported by Andrew John Hughes. - One glActiveTexture/glActiveTextureARB missing.
2003-01-30 01:18:27 +01:00
memcpy(pConstantData, &This->UpdateStateBlock->vertexShaderConstant[Register], ConstantCount * 4 * sizeof(FLOAT));
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3DDEVICE8 iface, DWORD Handle, void* pData, DWORD* pSizeOfData) {
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
/*ICOM_THIS(IDirect3DDevice8Impl,iface);*/
IDirect3DVertexShaderDeclarationImpl* attached_decl;
attached_decl = VERTEX_SHADER_DECL(Handle);
if (NULL == attached_decl) {
return D3DERR_INVALIDCALL;
}
return IDirect3DVertexShaderDeclarationImpl_GetDeclaration8(attached_decl, pData, (UINT*) pSizeOfData);
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD Handle, void* pData, DWORD* pSizeOfData) {
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
/*ICOM_THIS(IDirect3DDevice8Impl,iface);*/
IDirect3DVertexShaderImpl* object;
object = VERTEX_SHADER(Handle);
if (NULL == object) {
return D3DERR_INVALIDCALL;
}
return IDirect3DVertexShaderImpl_GetFunction(object, pData, (UINT*) pSizeOfData);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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 IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8* pIndexData, UINT BaseVertexIndex) {
- 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
ICOM_THIS(IDirect3DDevice8Impl,iface);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DIndexBuffer8 *oldIdxs;
TRACE("(%p) : Setting to %p, base %d\n", This, pIndexData, BaseVertexIndex);
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
oldIdxs = This->StateBlock->pIndexData;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
This->UpdateStateBlock->Changed.Indices = TRUE;
This->UpdateStateBlock->Set.Indices = TRUE;
This->UpdateStateBlock->pIndexData = pIndexData;
This->UpdateStateBlock->baseVertexIndex = BaseVertexIndex;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
if (oldIdxs) IDirect3DIndexBuffer8Impl_Release(oldIdxs);
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
if (pIndexData) IDirect3DIndexBuffer8Impl_AddRef(This->StateBlock->pIndexData);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8** ppIndexData,UINT* pBaseVertexIndex) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This);
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
*ppIndexData = This->StateBlock->pIndexData;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
/* up ref count on ppindexdata */
if (*ppIndexData) IDirect3DIndexBuffer8Impl_AddRef(*ppIndexData);
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
*pBaseVertexIndex = This->StateBlock->baseVertexIndex;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pFunction, DWORD* pHandle) {
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
IDirect3DPixelShaderImpl* object;
- 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
HRESULT res;
- 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
UINT i;
- 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
TRACE_(d3d_shader)("(%p) : PixelShader not fully supported yet : Func=%p\n", This, pFunction);
- 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
if (NULL == pFunction || NULL == pHandle) {
return D3DERR_INVALIDCALL;
}
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
for (i = 1; NULL != PixelShaders[i] && i < sizeof(PixelShaders) / sizeof(IDirect3DPixelShaderImpl*); ++i) ;
if (i >= sizeof(PixelShaders) / sizeof(IDirect3DPixelShaderImpl*)) {
- 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 D3DERR_OUTOFVIDEOMEMORY;
}
- 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
/** Create the Pixel Shader */
res = IDirect3DDeviceImpl_CreatePixelShader(This, pFunction, &object);
if (SUCCEEDED(res)) {
PixelShaders[i] = object;
*pHandle = VS_HIGHESTFIXEDFXF + i;
return D3D_OK;
}
*pHandle = 0xFFFFFFFF;
return res;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
This->UpdateStateBlock->PixelShader = Handle;
This->UpdateStateBlock->Changed.pixelShader = TRUE;
This->UpdateStateBlock->Set.pixelShader = TRUE;
/* Handle recording of state blocks */
if (This->isRecordingState) {
- 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
TRACE_(d3d_shader)("Recording... not performing anything\n");
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
/* FIXME: Quieten when not being used */
if (Handle != 0) {
- 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
FIXME_(d3d_shader)("(%p) : stub %ld\n", This, Handle);
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
} else {
- 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
TRACE_(d3d_shader)("(%p) : stub %ld\n", This, Handle);
- Initialize the texture state information. - Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.
2002-10-28 20:00:23 +01:00
}
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD* pHandle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
- 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
TRACE_(d3d_shader)("(%p) : GetPixelShader returning %ld\n", This, This->StateBlock->PixelShader);
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
*pHandle = This->StateBlock->PixelShader;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
IDirect3DPixelShaderImpl* object;
- 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
if (Handle <= VS_HIGHESTFIXEDFXF) { /* only delete user defined shaders */
return D3DERR_INVALIDCALL;
}
object = PixelShaders[Handle - VS_HIGHESTFIXEDFXF];
- 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
TRACE_(d3d_shader)("(%p) : freeing PixelShader %p\n", This, object);
- 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
/* TODO: check validity of object before free */
- 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
if (NULL != object->function) HeapFree(GetProcessHeap(), 0, (void *)object->function);
HeapFree(GetProcessHeap(), 0, (void *)object->data);
- 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
HeapFree(GetProcessHeap(), 0, (void *)object);
- 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
PixelShaders[Handle - VS_HIGHESTFIXEDFXF] = NULL;
- 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 D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
- 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
HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
if (Register + ConstantCount > D3D8_PSHADER_MAX_CONSTANTS) {
ERR_(d3d_shader)("(%p) : SetPixelShaderConstant C[%lu] invalid\n", This, Register);
return D3DERR_INVALIDCALL;
}
if (NULL == pConstantData) {
return D3DERR_INVALIDCALL;
}
if (ConstantCount > 1) {
FLOAT* f = (FLOAT*)pConstantData;
UINT i;
TRACE_(d3d_shader)("(%p) : SetPixelShaderConstant C[%lu..%lu]=\n", This, Register, Register + ConstantCount - 1);
for (i = 0; i < ConstantCount; ++i) {
TRACE_(d3d_shader)("{%f, %f, %f, %f}\n", f[0], f[1], f[2], f[3]);
f += 4;
}
} else {
FLOAT* f = (FLOAT*) pConstantData;
TRACE_(d3d_shader)("(%p) : SetPixelShaderConstant, C[%lu]={%f, %f, %f, %f}\n", This, Register, f[0], f[1], f[2], f[3]);
}
This->UpdateStateBlock->Changed.pixelShaderConstant = TRUE;
memcpy(&This->UpdateStateBlock->pixelShaderConstant[Register], pConstantData, ConstantCount * 4 * sizeof(FLOAT));
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +02: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
HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
TRACE_(d3d_shader)("(%p) : C[%lu] count=%ld\n", This, Register, ConstantCount);
if (Register + ConstantCount > D3D8_PSHADER_MAX_CONSTANTS) {
return D3DERR_INVALIDCALL;
}
if (NULL == pConstantData) {
return D3DERR_INVALIDCALL;
}
memcpy(pConstantData, &This->UpdateStateBlock->pixelShaderConstant[Register], ConstantCount * 4 * sizeof(FLOAT));
return D3D_OK;
Initial D3D8 implementation.
2002-09-28 00:46:16 +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
HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD Handle, void* pData, DWORD* pSizeOfData) {
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
IDirect3DPixelShaderImpl* object;
- 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
object = PIXEL_SHADER(Handle);
if (NULL == object) {
return D3DERR_INVALIDCALL;
- 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
}
return IDirect3DPixelShaderImpl_GetFunction(object, pData, (UINT*) pSizeOfData);
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
}
HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
FIXME("(%p) : stub\n", This); return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_SetStreamSource(LPDIRECT3DDEVICE8 iface, UINT StreamNumber,IDirect3DVertexBuffer8* pStreamData,UINT Stride) {
IDirect3DVertexBuffer8 *oldSrc;
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
oldSrc = This->StateBlock->stream_source[StreamNumber];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
TRACE("(%p) : StreamNo: %d, OldStream (%p), NewStream (%p), NewStride %d\n", This, StreamNumber, oldSrc, pStreamData, Stride);
This->UpdateStateBlock->Changed.stream_source[StreamNumber] = TRUE;
This->UpdateStateBlock->Set.stream_source[StreamNumber] = TRUE;
This->UpdateStateBlock->stream_stride[StreamNumber] = Stride;
This->UpdateStateBlock->stream_source[StreamNumber] = pStreamData;
/* Handle recording of state blocks */
if (This->isRecordingState) {
TRACE("Recording... not performing anything\n");
return D3D_OK;
}
if (oldSrc != NULL) IDirect3DVertexBuffer8Impl_Release(oldSrc);
if (pStreamData != NULL) IDirect3DVertexBuffer8Impl_AddRef(pStreamData);
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 iface, UINT StreamNumber,IDirect3DVertexBuffer8** pStream,UINT* pStride) {
ICOM_THIS(IDirect3DDevice8Impl,iface);
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
TRACE("(%p) : StreamNo: %d, Stream (%p), Stride %d\n", This, StreamNumber, This->StateBlock->stream_source[StreamNumber], This->StateBlock->stream_stride[StreamNumber]);
*pStream = This->StateBlock->stream_source[StreamNumber];
*pStride = This->StateBlock->stream_stride[StreamNumber];
Initial D3D8 implementation.
2002-09-28 00:46:16 +02:00
IDirect3DVertexBuffer8Impl_AddRef((LPDIRECT3DVERTEXBUFFER8) *pStream);
return D3D_OK;
}
ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl =
{
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DDevice8Impl_QueryInterface,
IDirect3DDevice8Impl_AddRef,
IDirect3DDevice8Impl_Release,
IDirect3DDevice8Impl_TestCooperativeLevel,
IDirect3DDevice8Impl_GetAvailableTextureMem,
IDirect3DDevice8Impl_ResourceManagerDiscardBytes,
IDirect3DDevice8Impl_GetDirect3D,
IDirect3DDevice8Impl_GetDeviceCaps,
IDirect3DDevice8Impl_GetDisplayMode,
IDirect3DDevice8Impl_GetCreationParameters,
IDirect3DDevice8Impl_SetCursorProperties,
IDirect3DDevice8Impl_SetCursorPosition,
IDirect3DDevice8Impl_ShowCursor,
IDirect3DDevice8Impl_CreateAdditionalSwapChain,
IDirect3DDevice8Impl_Reset,
IDirect3DDevice8Impl_Present,
IDirect3DDevice8Impl_GetBackBuffer,
IDirect3DDevice8Impl_GetRasterStatus,
IDirect3DDevice8Impl_SetGammaRamp,
IDirect3DDevice8Impl_GetGammaRamp,
IDirect3DDevice8Impl_CreateTexture,
IDirect3DDevice8Impl_CreateVolumeTexture,
IDirect3DDevice8Impl_CreateCubeTexture,
IDirect3DDevice8Impl_CreateVertexBuffer,
IDirect3DDevice8Impl_CreateIndexBuffer,
IDirect3DDevice8Impl_CreateRenderTarget,
IDirect3DDevice8Impl_CreateDepthStencilSurface,
IDirect3DDevice8Impl_CreateImageSurface,
IDirect3DDevice8Impl_CopyRects,
IDirect3DDevice8Impl_UpdateTexture,
IDirect3DDevice8Impl_GetFrontBuffer,
IDirect3DDevice8Impl_SetRenderTarget,
IDirect3DDevice8Impl_GetRenderTarget,
IDirect3DDevice8Impl_GetDepthStencilSurface,
IDirect3DDevice8Impl_BeginScene,
IDirect3DDevice8Impl_EndScene,
IDirect3DDevice8Impl_Clear,
IDirect3DDevice8Impl_SetTransform,
IDirect3DDevice8Impl_GetTransform,
IDirect3DDevice8Impl_MultiplyTransform,
IDirect3DDevice8Impl_SetViewport,
IDirect3DDevice8Impl_GetViewport,
IDirect3DDevice8Impl_SetMaterial,
IDirect3DDevice8Impl_GetMaterial,
IDirect3DDevice8Impl_SetLight,
IDirect3DDevice8Impl_GetLight,
IDirect3DDevice8Impl_LightEnable,
IDirect3DDevice8Impl_GetLightEnable,
IDirect3DDevice8Impl_SetClipPlane,
IDirect3DDevice8Impl_GetClipPlane,
IDirect3DDevice8Impl_SetRenderState,
IDirect3DDevice8Impl_GetRenderState,
IDirect3DDevice8Impl_BeginStateBlock,
IDirect3DDevice8Impl_EndStateBlock,
IDirect3DDevice8Impl_ApplyStateBlock,
IDirect3DDevice8Impl_CaptureStateBlock,
IDirect3DDevice8Impl_DeleteStateBlock,
IDirect3DDevice8Impl_CreateStateBlock,
IDirect3DDevice8Impl_SetClipStatus,
IDirect3DDevice8Impl_GetClipStatus,
IDirect3DDevice8Impl_GetTexture,
IDirect3DDevice8Impl_SetTexture,
IDirect3DDevice8Impl_GetTextureStageState,
IDirect3DDevice8Impl_SetTextureStageState,
IDirect3DDevice8Impl_ValidateDevice,
IDirect3DDevice8Impl_GetInfo,
IDirect3DDevice8Impl_SetPaletteEntries,
IDirect3DDevice8Impl_GetPaletteEntries,
IDirect3DDevice8Impl_SetCurrentTexturePalette,
IDirect3DDevice8Impl_GetCurrentTexturePalette,
IDirect3DDevice8Impl_DrawPrimitive,
IDirect3DDevice8Impl_DrawIndexedPrimitive,
IDirect3DDevice8Impl_DrawPrimitiveUP,
IDirect3DDevice8Impl_DrawIndexedPrimitiveUP,
IDirect3DDevice8Impl_ProcessVertices,
IDirect3DDevice8Impl_CreateVertexShader,
IDirect3DDevice8Impl_SetVertexShader,
IDirect3DDevice8Impl_GetVertexShader,
IDirect3DDevice8Impl_DeleteVertexShader,
IDirect3DDevice8Impl_SetVertexShaderConstant,
IDirect3DDevice8Impl_GetVertexShaderConstant,
IDirect3DDevice8Impl_GetVertexShaderDeclaration,
IDirect3DDevice8Impl_GetVertexShaderFunction,
IDirect3DDevice8Impl_SetStreamSource,
IDirect3DDevice8Impl_GetStreamSource,
IDirect3DDevice8Impl_SetIndices,
IDirect3DDevice8Impl_GetIndices,
IDirect3DDevice8Impl_CreatePixelShader,
IDirect3DDevice8Impl_SetPixelShader,
IDirect3DDevice8Impl_GetPixelShader,
IDirect3DDevice8Impl_DeletePixelShader,
IDirect3DDevice8Impl_SetPixelShaderConstant,
IDirect3DDevice8Impl_GetPixelShaderConstant,
IDirect3DDevice8Impl_GetPixelShaderFunction,
IDirect3DDevice8Impl_DrawRectPatch,
IDirect3DDevice8Impl_DrawTriPatch,
IDirect3DDevice8Impl_DeletePatch
};
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
Warning fix.
2003-07-15 22:52:21 +02:00
HRESULT WINAPI IDirect3DDevice8Impl_CleanRender(LPDIRECT3DDEVICE8 iface)
{
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
#if defined(GL_VERSION_1_3) /* @see comments on ActiveRender */
Warning fix.
2003-07-15 22:52:21 +02:00
ICOM_THIS(IDirect3DDevice8Impl,iface);
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
#if 0
if (This->glCtx != This->render_ctx) {
glXDestroyContext(This->display, This->render_ctx);
This->render_ctx = This->glCtx;
}
#endif
if (This->win != This->drawable) {
glXDestroyPbuffer(This->display, This->drawable);
This->drawable = This->win;
}
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
#endif
return D3D_OK;
}
HRESULT WINAPI IDirect3DDevice8Impl_ActiveRender(LPDIRECT3DDEVICE8 iface,
IDirect3DSurface8* RenderSurface,
IDirect3DSurface8* StencilSurface) {
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
HRESULT ret = D3DERR_INVALIDCALL;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
/**
* Currently only active for GLX >= 1.3
* for others versions we'll have to use GLXPixmaps
*
* normally we must test GLX_VERSION_1_3 but nvidia headers are not correct
* as they implements GLX 1.3 but only define GLX_VERSION_1_2
* so only check OpenGL version
*/
#if defined(GL_VERSION_1_3)
GLXFBConfig* cfgs = NULL;
int nCfgs = 0;
int attribs[256];
int nAttribs = 0;
D3DFORMAT BackBufferFormat = ((IDirect3DSurface8Impl*) RenderSurface)->myDesc.Format;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
D3DFORMAT StencilBufferFormat = (NULL != StencilSurface) ? ((IDirect3DSurface8Impl*) StencilSurface)->myDesc.Format : 0;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
UINT Width = ((IDirect3DSurface8Impl*) RenderSurface)->myDesc.Width;
UINT Height = ((IDirect3DSurface8Impl*) RenderSurface)->myDesc.Height;
IDirect3DSurface8Impl* tmp;
ICOM_THIS(IDirect3DDevice8Impl,iface);
#define PUSH1(att) attribs[nAttribs++] = (att);
#define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value);
PUSH2(GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT | GLX_WINDOW | GLX_PBUFFER_BIT);
PUSH2(GLX_X_RENDERABLE, TRUE);
PUSH2(GLX_DOUBLEBUFFER, TRUE);
switch (BackBufferFormat) {
/* color buffer */
case D3DFMT_P8:
PUSH2(GLX_RENDER_TYPE, GLX_COLOR_INDEX_BIT);
PUSH2(GLX_BUFFER_SIZE, 8);
PUSH2(GLX_DOUBLEBUFFER, TRUE);
break;
case D3DFMT_R3G3B2:
PUSH2(GLX_RENDER_TYPE, GLX_RGBA_BIT);
PUSH2(GLX_RED_SIZE, 3);
PUSH2(GLX_GREEN_SIZE, 3);
PUSH2(GLX_BLUE_SIZE, 2);
break;
case D3DFMT_A1R5G5B5:
PUSH2(GLX_ALPHA_SIZE, 1);
case D3DFMT_X1R5G5B5:
PUSH2(GLX_RED_SIZE, 5);
PUSH2(GLX_GREEN_SIZE, 5);
PUSH2(GLX_BLUE_SIZE, 5);
break;
case D3DFMT_R5G6B5:
PUSH2(GLX_RED_SIZE, 5);
PUSH2(GLX_GREEN_SIZE, 6);
PUSH2(GLX_BLUE_SIZE, 5);
break;
case D3DFMT_A4R4G4B4:
PUSH2(GLX_ALPHA_SIZE, 4);
case D3DFMT_X4R4G4B4:
PUSH2(GLX_RED_SIZE, 4);
PUSH2(GLX_GREEN_SIZE, 4);
PUSH2(GLX_BLUE_SIZE, 4);
break;
case D3DFMT_A8R8G8B8:
PUSH2(GLX_ALPHA_SIZE, 8);
case D3DFMT_R8G8B8:
case D3DFMT_X8R8G8B8:
PUSH2(GLX_RED_SIZE, 8);
PUSH2(GLX_GREEN_SIZE, 8);
PUSH2(GLX_BLUE_SIZE, 8);
break;
default:
break;
}
switch (StencilBufferFormat) {
case D3DFMT_D16_LOCKABLE:
case D3DFMT_D16:
PUSH2(GLX_DEPTH_SIZE, 16);
break;
case D3DFMT_D15S1:
PUSH2(GLX_DEPTH_SIZE, 15);
break;
case D3DFMT_D24X8:
PUSH2(GLX_DEPTH_SIZE, 24);
break;
case D3DFMT_D24X4S4:
PUSH2(GLX_DEPTH_SIZE, 24);
PUSH2(GLX_STENCIL_SIZE, 4);
break;
case D3DFMT_D24S8:
PUSH2(GLX_DEPTH_SIZE, 24);
PUSH2(GLX_STENCIL_SIZE, 8);
break;
case D3DFMT_D32:
PUSH2(GLX_DEPTH_SIZE, 32);
break;
default:
break;
}
PUSH1(None);
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ENTER_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
cfgs = glXChooseFBConfig(This->display, DefaultScreen(This->display), attribs, &nCfgs);
if (NULL != cfgs) {
#if 0
int i;
for (i = 0; i < nCfgs; ++i) {
TRACE("for (%u,%s)/(%u,%s) found config[%d]@%p\n", BackBufferFormat, debug_d3dformat(BackBufferFormat), StencilBufferFormat, debug_d3dformat(StencilBufferFormat), i, cfgs[i]);
}
#endif
if (NULL != This->renderTarget) {
GLenum prev_read;
glFlush();
vcheckGLcall("glFlush");
#if 0
/** very very usefull debug code */
glXSwapBuffers(This->display, This->drawable);
printf("Hit Enter to get next frame ...\n");
getchar();
#endif
glGetIntegerv(GL_READ_BUFFER, &prev_read);
vcheckGLcall("glIntegerv");
glReadBuffer(GL_BACK);
vcheckGLcall("glReadBuffer");
{
long j;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
long pitch = This->renderTarget->myDesc.Width * This->renderTarget->bytesPerPixel;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
for (j = 0; j < This->renderTarget->myDesc.Height; ++j) {
glReadPixels(0,
This->renderTarget->myDesc.Height - j - 1,
This->renderTarget->myDesc.Width,
1,
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
D3DFmt2GLFmt(This, This->renderTarget->myDesc.Format),
D3DFmt2GLType(This, This->renderTarget->myDesc.Format),
This->renderTarget->allocatedMemory + j * pitch);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
vcheckGLcall("glReadPixels");
}
}
glReadBuffer(prev_read);
vcheckGLcall("glReadBuffer");
}
if (BackBufferFormat != This->renderTarget->myDesc.Format &&
StencilBufferFormat != This->stencilBufferTarget->myDesc.Format) {
nAttribs = 0;
PUSH2(GLX_PBUFFER_WIDTH, Width);
PUSH2(GLX_PBUFFER_HEIGHT, Height);
PUSH1(None);
This->drawable = glXCreatePbuffer(This->display, cfgs[0], attribs);
This->render_ctx = glXCreateNewContext(This->display, cfgs[0], GLX_RGBA_TYPE, This->glCtx, TRUE);
if (NULL == This->render_ctx) {
ERR("cannot create glxContext\n");
}
glFlush();
glXSwapBuffers(This->display, This->drawable);
if (glXMakeContextCurrent(This->display, This->drawable, This->drawable, This->render_ctx) == False) {
TRACE("Error in setting current context: context %p drawable %ld (default %ld)!\n", This->glCtx, This->drawable, This->win);
}
checkGLcall("glXMakeContextCurrent");
}
tmp = This->renderTarget;
This->renderTarget = (IDirect3DSurface8Impl*) RenderSurface;
IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) This->renderTarget);
IDirect3DSurface8Impl_Release((LPDIRECT3DSURFACE8) tmp);
tmp = This->stencilBufferTarget;
This->stencilBufferTarget = (IDirect3DSurface8Impl*) StencilSurface;
- some cleanups - more cubetextures fixes (now d3d8 sdk cubemap sample work almost perfectly) - add a new debug function "debug_d3dpool" and use it - add a new param (the device) for the conversions functions (because we need to check caps to see how to convert) - some crashes fixed in render to surface code with no stencil-depth surface - a very simple cliplane fix - a stupid palettes fix (stupid language) - begin of anisotropic filter support - begin of compressed textures support - a very useful debug functions: IDirect3DSurface8Impl_SaveSnapshot to dump surfaces as png ;) - many useful surfaces debug code (using SaveSnapshot)
2003-06-05 00:12:34 +02:00
if (NULL != This->stencilBufferTarget) IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) This->stencilBufferTarget);
if (NULL != tmp) IDirect3DSurface8Impl_Release((LPDIRECT3DSURFACE8) tmp);
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
ret = D3D_OK;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
} else {
ERR("cannot get valides GLXFBConfig for (%u,%s)/(%u,%s)\n", BackBufferFormat, debug_d3dformat(BackBufferFormat), StencilBufferFormat, debug_d3dformat(StencilBufferFormat));
}
#undef PUSH1
#undef PUSH2
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
LEAVE_GL();
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
#endif
- dsound and d3d works better when x11drv locks/unlocks are correct - more traces
2003-06-18 05:17:42 +02:00
return ret;
- implemented render to surfaces (and render to new rendertargets) using glx pbuffers (with a useful debug code to display rendered surface into window drawable) - better cubetextures - split utilities functions into utils.c and added more - more readable debug again - a better caps code (not perfect but i'll use glx code later) - use of the new caps code - begin of UpdateTexture - begin of Cursor support - cleaning most of deprecated #if 0/#endif - correct some lockable/unlockable behavior - correct some returns code
2003-06-04 23:55:29 +02:00
}