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

2632 lines
134 KiB
C
Raw Normal View History

- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
/*
* Utility functions for the WineD3D Library
*
* Copyright 2002-2004 Jason Edmeades
* Copyright 2003-2004 Raphael Junqueira
* Copyright 2004 Christian Costa
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
* Copyright 2005 Oliver Stieber
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
* Copyright 2006 Henri Verbeet
- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
*
* 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
Update the address of the Free Software Foundation.
2006-05-18 14:49:52 +02:00
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
*/
#include "config.h"
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
/*****************************************************************************
* Pixel format array
*/
static const PixelFormatDesc formats[] = {
/*{WINED3DFORMAT ,alphamask ,redmask ,greenmask ,bluemask ,bpp ,isFourcc ,internal ,format ,type }*/
{WINED3DFMT_UNKNOWN ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,0 ,0 ,0 },
/* FourCC formats, kept here to have WINED3DFMT_R8G8B8(=20) at position 20 */
{WINED3DFMT_UYVY ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 },
{WINED3DFMT_YUY2 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 },
wined3d: Cleanup the surface loading code a bit. - Separate allocation and uploading of textures. - Move common code for allocating, uploading and downloading textures into separate functions. - Set the correct format and type for DXT textures.
2006-09-11 18:51:18 +02:00
{WINED3DFMT_DXT1 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,GL_RGBA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_DXT2 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,GL_RGBA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_DXT3 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,GL_RGBA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_DXT4 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,GL_RGBA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_DXT5 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,GL_RGBA ,GL_UNSIGNED_BYTE },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_MULTI2_ARGB ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 },
{WINED3DFMT_G8R8_G8B8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 },
{WINED3DFMT_R8G8_B8G8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 },
/* IEEE formats */
wined3d: Add support for R32F and R16F texture formats.
2006-09-05 09:40:24 +02:00
{WINED3DFMT_R32F ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGB32F_ARB ,GL_RED ,GL_FLOAT },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_G32R32F ,0x0 ,0x0 ,0x0 ,0x0 ,8 ,FALSE ,0 ,0 ,0 },
wined3d: Add support for A16B16G16R16F and A32B32G32R32F texture formats.
2006-08-27 04:34:03 +02:00
{WINED3DFMT_A32B32G32R32F,0x0 ,0x0 ,0x0 ,0x0 ,16 ,FALSE ,GL_RGBA32F_ARB ,GL_RGBA ,GL_FLOAT },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
/* Hmm? */
{WINED3DFMT_CxV8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 },
/* Float */
wined3d: Add support for R32F and R16F texture formats.
2006-09-05 09:40:24 +02:00
{WINED3DFMT_R16F ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_RGB16F_ARB ,GL_RED ,GL_HALF_FLOAT_ARB },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_G16R16F ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
wined3d: Add support for A16B16G16R16F and A32B32G32R32F texture formats.
2006-08-27 04:34:03 +02:00
{WINED3DFMT_A16B16G16R16F,0x0 ,0x0 ,0x0 ,0x0 ,8 ,FALSE ,GL_RGBA16F_ARB ,GL_RGBA ,GL_HALF_FLOAT_ARB },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
/* Palettized formats */
{WINED3DFMT_A8P8 ,0x0000ff00 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_P8 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_BYTE },
/* Standard ARGB formats. Keep WINED3DFMT_R8G8B8(=20) at position 20 */
wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.
2006-07-05 18:31:38 +02:00
{WINED3DFMT_R8G8B8 ,0x0 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,3 ,FALSE ,GL_RGB8 ,GL_BGR ,GL_UNSIGNED_BYTE },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_A8R8G8B8 ,0xff000000 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4 ,FALSE ,GL_RGBA8 ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV },
{WINED3DFMT_X8R8G8B8 ,0x0 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4 ,FALSE ,GL_RGB8 ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV },
{WINED3DFMT_R5G6B5 ,0x0 ,0x0000F800 ,0x000007e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5 ,GL_RGB ,GL_UNSIGNED_SHORT_5_6_5 },
{WINED3DFMT_X1R5G5B5 ,0x0 ,0x00007c00 ,0x000003e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV },
{WINED3DFMT_A1R5G5B5 ,0x00008000 ,0x00007c00 ,0x000003e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV },
{WINED3DFMT_A4R4G4B4 ,0x0000f000 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGBA4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV },
{WINED3DFMT_R3G3B2 ,0x0 ,0x000000e0 ,0x0000001c ,0x00000003 ,1 ,FALSE ,GL_R3_G3_B2 ,GL_RGB ,GL_UNSIGNED_BYTE_2_3_3_REV },
{WINED3DFMT_A8 ,0x000000ff ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_ALPHA8 ,GL_ALPHA ,GL_ALPHA },
{WINED3DFMT_A8R3G3B2 ,0x0000ff00 ,0x000000e0 ,0x0000001c ,0x00000003 ,2 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_X4R4G4B4 ,0x0 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGB4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV },
wined3d: Whitelist pixelformats instead of blacklisting.
2006-07-22 01:58:19 +02:00
{WINED3DFMT_A2B10G10R10 ,0xb0000000 ,0x000003ff ,0x000ffc00 ,0x3ff00000 ,4 ,FALSE ,GL_RGB ,GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_A8B8G8R8 ,0xff000000 ,0x000000ff ,0x0000ff00 ,0x00ff0000 ,4 ,FALSE ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV },
{WINED3DFMT_X8B8G8R8 ,0x0 ,0x000000ff ,0x0000ff00 ,0x00ff0000 ,4 ,FALSE ,GL_RGB8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV },
{WINED3DFMT_G16R16 ,0x0 ,0x0000ffff ,0xffff0000 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
wined3d: Whitelist pixelformats instead of blacklisting.
2006-07-22 01:58:19 +02:00
{WINED3DFMT_A2R10G10B10 ,0xb0000000 ,0x3ff00000 ,0x000ffc00 ,0x000003ff ,4 ,FALSE ,GL_RGBA ,GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV },
wined3d: Pixel format cleanup.
2006-06-21 10:36:14 +02:00
{WINED3DFMT_A16B16G16R16,0x0 ,0x0000ffff ,0xffff0000 ,0x0 ,8 ,FALSE ,GL_RGBA16_EXT ,GL_RGBA ,GL_UNSIGNED_SHORT },
/* Luminance */
{WINED3DFMT_L8 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_LUMINANCE8 ,GL_LUMINANCE ,GL_UNSIGNED_BYTE },
{WINED3DFMT_A8L8 ,0x0000ff00 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_LUMINANCE8_ALPHA8 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_A4L4 ,0x000000f0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE },
/* Bump mapping stuff */
{WINED3DFMT_V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_BYTE },
{WINED3DFMT_L6V5U5 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT_5_5_5_1 },
{WINED3DFMT_X8L8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_BGRA ,GL_UNSIGNED_BYTE },
{WINED3DFMT_Q8W8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV/*?*/},
{WINED3DFMT_V16U16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT },
{WINED3DFMT_W11V11U10 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_A2W10V10U10 ,0xb0000000 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
/* Depth stencil formats */
{WINED3DFMT_D16_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT },
{WINED3DFMT_D32 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT },
{WINED3DFMT_D15S1 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT },
{WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT },
{WINED3DFMT_D24X8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT },
{WINED3DFMT_D24X4S4 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT },
{WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT },
{WINED3DFMT_L16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_LUMINANCE16_EXT ,GL_LUMINANCE ,GL_UNSIGNED_SHORT },
{WINED3DFMT_D32F_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_D24FS8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
/* Is this a vertex buffer? */
{WINED3DFMT_VERTEXDATA ,0x0 ,0x0 ,0x0 ,0x0 ,0 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_INDEX16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_INDEX32 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 },
{WINED3DFMT_Q16W16V16U16,0x0 ,0x0 ,0x0 ,0x0 ,8 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT }
};
const PixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt)
{
/* First check if the format is at the position of its value.
* This will catch the argb formats before the loop is entered
*/
if(fmt < (sizeof(formats) / sizeof(formats[0])) && formats[fmt].format == fmt) {
return &formats[fmt];
} else {
unsigned int i;
for(i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
if(formats[i].format == fmt) {
return &formats[i];
}
}
}
FIXME("Can't find format %s(%d) in the format lookup table\n", debug_d3dformat(fmt), fmt);
if(fmt == WINED3DFMT_UNKNOWN) {
ERR("Format table corrupt - Can't find WINED3DFMT_UNKNOWN\n");
return NULL;
}
/* Get the caller a valid pointer */
return getFormatDescEntry(WINED3DFMT_UNKNOWN);
}
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/*****************************************************************************
* Trace formatting of useful values
*/
Correct a few formats that were incorrect.
2005-07-13 21:38:39 +02:00
const char* debug_d3dformat(WINED3DFORMAT fmt) {
- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
switch (fmt) {
#define FMT_TO_STR(fmt) case fmt: return #fmt
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_UNKNOWN);
FMT_TO_STR(WINED3DFMT_R8G8B8);
FMT_TO_STR(WINED3DFMT_A8R8G8B8);
FMT_TO_STR(WINED3DFMT_X8R8G8B8);
FMT_TO_STR(WINED3DFMT_R5G6B5);
FMT_TO_STR(WINED3DFMT_X1R5G5B5);
FMT_TO_STR(WINED3DFMT_A1R5G5B5);
FMT_TO_STR(WINED3DFMT_A4R4G4B4);
FMT_TO_STR(WINED3DFMT_R3G3B2);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
FMT_TO_STR(WINED3DFMT_A8);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_A8R3G3B2);
FMT_TO_STR(WINED3DFMT_X4R4G4B4);
wined3d: Add a couple more debugging output formats.
2006-04-03 17:01:19 +02:00
FMT_TO_STR(WINED3DFMT_A2B10G10R10);
wined3d: Add D3DFMT_L16.
2006-04-04 15:34:46 +02:00
FMT_TO_STR(WINED3DFMT_A8B8G8R8);
wined3d: Add a couple more debugging output formats.
2006-04-03 17:01:19 +02:00
FMT_TO_STR(WINED3DFMT_X8B8G8R8);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_G16R16);
FMT_TO_STR(WINED3DFMT_A2R10G10B10);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
FMT_TO_STR(WINED3DFMT_A16B16G16R16);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_A8P8);
FMT_TO_STR(WINED3DFMT_P8);
FMT_TO_STR(WINED3DFMT_L8);
FMT_TO_STR(WINED3DFMT_A8L8);
FMT_TO_STR(WINED3DFMT_A4L4);
FMT_TO_STR(WINED3DFMT_V8U8);
FMT_TO_STR(WINED3DFMT_L6V5U5);
FMT_TO_STR(WINED3DFMT_X8L8V8U8);
FMT_TO_STR(WINED3DFMT_Q8W8V8U8);
FMT_TO_STR(WINED3DFMT_V16U16);
FMT_TO_STR(WINED3DFMT_W11V11U10);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
FMT_TO_STR(WINED3DFMT_A2W10V10U10);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_UYVY);
FMT_TO_STR(WINED3DFMT_YUY2);
FMT_TO_STR(WINED3DFMT_DXT1);
FMT_TO_STR(WINED3DFMT_DXT2);
FMT_TO_STR(WINED3DFMT_DXT3);
FMT_TO_STR(WINED3DFMT_DXT4);
FMT_TO_STR(WINED3DFMT_DXT5);
FMT_TO_STR(WINED3DFMT_MULTI2_ARGB);
FMT_TO_STR(WINED3DFMT_G8R8_G8B8);
FMT_TO_STR(WINED3DFMT_R8G8_B8G8);
FMT_TO_STR(WINED3DFMT_D16_LOCKABLE);
FMT_TO_STR(WINED3DFMT_D32);
FMT_TO_STR(WINED3DFMT_D15S1);
FMT_TO_STR(WINED3DFMT_D24S8);
FMT_TO_STR(WINED3DFMT_D24X8);
FMT_TO_STR(WINED3DFMT_D24X4S4);
FMT_TO_STR(WINED3DFMT_D16);
wined3d: Add D3DFMT_L16.
2006-04-04 15:34:46 +02:00
FMT_TO_STR(WINED3DFMT_L16);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_D32F_LOCKABLE);
wined3d: Add D3DFMT_L16.
2006-04-04 15:34:46 +02:00
FMT_TO_STR(WINED3DFMT_D24FS8);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
FMT_TO_STR(WINED3DFMT_VERTEXDATA);
FMT_TO_STR(WINED3DFMT_INDEX16);
FMT_TO_STR(WINED3DFMT_INDEX32);
FMT_TO_STR(WINED3DFMT_Q16W16V16U16);
FMT_TO_STR(WINED3DFMT_R16F);
FMT_TO_STR(WINED3DFMT_G16R16F);
FMT_TO_STR(WINED3DFMT_A16B16G16R16F);
wined3d: Add a few more WINED3DFMT formats to be recognized.
2006-03-06 03:26:19 +01:00
FMT_TO_STR(WINED3DFMT_R32F);
FMT_TO_STR(WINED3DFMT_G32R32F);
FMT_TO_STR(WINED3DFMT_A32B32G32R32F);
FMT_TO_STR(WINED3DFMT_CxV8U8);
- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
#undef FMT_TO_STR
default:
wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
2006-06-09 17:29:57 +02:00
{
char fourcc[5];
fourcc[0] = (char)(fmt);
fourcc[1] = (char)(fmt >> 8);
fourcc[2] = (char)(fmt >> 16);
fourcc[3] = (char)(fmt >> 24);
fourcc[4] = 0;
if( isprint(fourcc[0]) && isprint(fourcc[1]) && isprint(fourcc[2]) && isprint(fourcc[3]) )
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 03:51:13 +02:00
FIXME("Unrecognized %u (as fourcc: %s) WINED3DFORMAT!\n", fmt, fourcc);
wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
2006-06-09 17:29:57 +02:00
else
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 03:51:13 +02:00
FIXME("Unrecognized %u WINED3DFORMAT!\n", fmt);
wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
2006-06-09 17:29:57 +02:00
}
- Make d3d8 know about the wined3d device and start using it. - Move some of the screen mode related functions into wined3d and add untested support for the new d3d9 options of providing the format to some of the calls. - Move other functions from the directx interface into the common library and implement the calls from d3d9 as well. - Copy across the first of the functions used to make traces more readable, creating utils.c to store them in. Eventually the ones in d3d8 will be removed but for now just duplicate the code.
2004-09-28 04:12:12 +02:00
return "unrecognized";
}
}
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:00 +02:00
const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) {
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
switch (devtype) {
#define DEVTYPE_TO_STR(dev) case dev: return #dev
wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:00 +02:00
DEVTYPE_TO_STR(WINED3DDEVTYPE_HAL);
DEVTYPE_TO_STR(WINED3DDEVTYPE_REF);
DEVTYPE_TO_STR(WINED3DDEVTYPE_SW);
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
#undef DEVTYPE_TO_STR
default:
wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:00 +02:00
FIXME("Unrecognized %u WINED3DDEVTYPE!\n", devtype);
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
return "unrecognized";
}
}
const char* debug_d3dusage(DWORD usage) {
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-28 21:33:20 +02:00
switch (usage & WINED3DUSAGE_MASK) {
wined3d: Define D3D usage flags in wined3d_types.h.
2006-03-06 23:08:42 +01:00
#define WINED3DUSAGE_TO_STR(u) case u: return #u
WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_DONOTCLIP);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_POINTS);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_RTPATCHES);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC);
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-28 21:33:20 +02:00
WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP);
WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP);
wined3d: Define D3D usage flags in wined3d_types.h.
2006-03-06 23:08:42 +01:00
#undef WINED3DUSAGE_TO_STR
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
case 0: return "none";
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized %u Usage!\n", usage);
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
return "unrecognized";
}
}
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-28 21:33:20 +02:00
const char* debug_d3dusagequery(DWORD usagequery) {
switch (usagequery & WINED3DUSAGE_QUERY_MASK) {
#define WINED3DUSAGEQUERY_TO_STR(u) case u: return #u
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE);
WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP);
#undef WINED3DUSAGEQUERY_TO_STR
case 0: return "none";
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized %u Usage Query!\n", usagequery);
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-28 21:33:20 +02:00
return "unrecognized";
}
}
wined3d: Add a couple of traces to the vertexdeclaration creation code.
2006-08-07 19:21:54 +02:00
const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) {
switch (method) {
#define WINED3DDECLMETHOD_TO_STR(u) case u: return #u
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP);
WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED);
#undef WINED3DDECLMETHOD_TO_STR
default:
FIXME("Unrecognized %u declaration method!\n", method);
return "unrecognized";
}
}
const char* debug_d3ddecltype(WINED3DDECLTYPE type) {
switch (type) {
#define WINED3DDECLTYPE_TO_STR(u) case u: return #u
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT1);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT2);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT3);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT4);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_D3DCOLOR);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT2N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT4N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UDEC3);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_DEC3N);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_2);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_4);
WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UNUSED);
#undef WINED3DDECLTYPE_TO_STR
default:
FIXME("Unrecognized %u declaration type!\n", type);
return "unrecognized";
}
}
wined3d: Add a function to print out D3DDECLUSAGE9 values.
2006-07-03 08:11:15 +02:00
const char* debug_d3ddeclusage(BYTE usage) {
switch (usage) {
#define WINED3DDECLUSAGE_TO_STR(u) case u: return #u
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_POSITION);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BLENDWEIGHT);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BLENDINDICES);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_NORMAL);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_PSIZE);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TEXCOORD);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TANGENT);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BINORMAL);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TESSFACTOR);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_POSITIONT);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_COLOR);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_FOG);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_DEPTH);
WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_SAMPLE);
#undef WINED3DDECLUSAGE_TO_STR
default:
FIXME("Unrecognized %u declaration usage!\n", usage);
return "unrecognized";
}
}
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-09 23:21:16 +01:00
const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) {
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
switch (res) {
#define RES_TO_STR(res) case res: return #res;
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-09 23:21:16 +01:00
RES_TO_STR(WINED3DRTYPE_SURFACE);
RES_TO_STR(WINED3DRTYPE_VOLUME);
RES_TO_STR(WINED3DRTYPE_TEXTURE);
RES_TO_STR(WINED3DRTYPE_VOLUMETEXTURE);
RES_TO_STR(WINED3DRTYPE_CUBETEXTURE);
RES_TO_STR(WINED3DRTYPE_VERTEXBUFFER);
RES_TO_STR(WINED3DRTYPE_INDEXBUFFER);
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
#undef RES_TO_STR
default:
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-09 23:21:16 +01:00
FIXME("Unrecognized %u WINED3DRESOURCETYPE!\n", res);
Move the Check* type functions into wined3d and copy from d3d9, and flag that they are mostly stubs.
2004-10-05 04:14:06 +02:00
return "unrecognized";
}
}
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing functionality into wined3d and call from d3d9.
2004-12-09 12:42:34 +01:00
wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
2006-10-12 08:23:55 +02:00
const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) {
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing functionality into wined3d and call from d3d9.
2004-12-09 12:42:34 +01:00
switch (PrimitiveType) {
#define PRIM_TO_STR(prim) case prim: return #prim;
wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
2006-10-12 08:23:55 +02:00
PRIM_TO_STR(WINED3DPT_POINTLIST);
PRIM_TO_STR(WINED3DPT_LINELIST);
PRIM_TO_STR(WINED3DPT_LINESTRIP);
PRIM_TO_STR(WINED3DPT_TRIANGLELIST);
PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP);
PRIM_TO_STR(WINED3DPT_TRIANGLEFAN);
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing functionality into wined3d and call from d3d9.
2004-12-09 12:42:34 +01:00
#undef PRIM_TO_STR
default:
wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
2006-10-12 08:23:55 +02:00
FIXME("Unrecognized %u WINED3DPRIMITIVETYPE!\n", PrimitiveType);
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing functionality into wined3d and call from d3d9.
2004-12-09 12:42:34 +01:00
return "unrecognized";
}
}
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
const char* debug_d3drenderstate(DWORD state) {
switch (state) {
#define D3DSTATE_TO_STR(u) case u: return #u
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_TEXTUREHANDLE );
D3DSTATE_TO_STR(WINED3DRS_ANTIALIAS );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESS );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREPERSPECTIVE );
D3DSTATE_TO_STR(WINED3DRS_WRAPU );
D3DSTATE_TO_STR(WINED3DRS_WRAPV );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_ZENABLE );
D3DSTATE_TO_STR(WINED3DRS_FILLMODE );
D3DSTATE_TO_STR(WINED3DRS_SHADEMODE );
D3DSTATE_TO_STR(WINED3DRS_LINEPATTERN );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_MONOENABLE );
D3DSTATE_TO_STR(WINED3DRS_ROP2 );
D3DSTATE_TO_STR(WINED3DRS_PLANEMASK );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_ZWRITEENABLE );
D3DSTATE_TO_STR(WINED3DRS_ALPHATESTENABLE );
D3DSTATE_TO_STR(WINED3DRS_LASTPIXEL );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAG );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREMIN );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_SRCBLEND );
D3DSTATE_TO_STR(WINED3DRS_DESTBLEND );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAPBLEND );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_CULLMODE );
D3DSTATE_TO_STR(WINED3DRS_ZFUNC );
D3DSTATE_TO_STR(WINED3DRS_ALPHAREF );
D3DSTATE_TO_STR(WINED3DRS_ALPHAFUNC );
D3DSTATE_TO_STR(WINED3DRS_DITHERENABLE );
D3DSTATE_TO_STR(WINED3DRS_ALPHABLENDENABLE );
D3DSTATE_TO_STR(WINED3DRS_FOGENABLE );
D3DSTATE_TO_STR(WINED3DRS_SPECULARENABLE );
D3DSTATE_TO_STR(WINED3DRS_ZVISIBLE );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_SUBPIXEL );
D3DSTATE_TO_STR(WINED3DRS_SUBPIXELX );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEDALPHA );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_FOGCOLOR );
D3DSTATE_TO_STR(WINED3DRS_FOGTABLEMODE );
D3DSTATE_TO_STR(WINED3DRS_FOGSTART );
D3DSTATE_TO_STR(WINED3DRS_FOGEND );
D3DSTATE_TO_STR(WINED3DRS_FOGDENSITY );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_STIPPLEENABLE );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE );
D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSU );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSV );
D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_ZBIAS );
D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_ANISOTROPY );
D3DSTATE_TO_STR(WINED3DRS_FLUSHBATCH );
D3DSTATE_TO_STR(WINED3DRS_TRANSLUCENTSORTINDEPENDENT);
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_STENCILENABLE );
D3DSTATE_TO_STR(WINED3DRS_STENCILFAIL );
D3DSTATE_TO_STR(WINED3DRS_STENCILZFAIL );
D3DSTATE_TO_STR(WINED3DRS_STENCILPASS );
D3DSTATE_TO_STR(WINED3DRS_STENCILFUNC );
D3DSTATE_TO_STR(WINED3DRS_STENCILREF );
D3DSTATE_TO_STR(WINED3DRS_STENCILMASK );
D3DSTATE_TO_STR(WINED3DRS_STENCILWRITEMASK );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREFACTOR );
D3DSTATE_TO_STR(WINED3DRS_WRAP0 );
D3DSTATE_TO_STR(WINED3DRS_WRAP1 );
D3DSTATE_TO_STR(WINED3DRS_WRAP2 );
D3DSTATE_TO_STR(WINED3DRS_WRAP3 );
D3DSTATE_TO_STR(WINED3DRS_WRAP4 );
D3DSTATE_TO_STR(WINED3DRS_WRAP5 );
D3DSTATE_TO_STR(WINED3DRS_WRAP6 );
D3DSTATE_TO_STR(WINED3DRS_WRAP7 );
D3DSTATE_TO_STR(WINED3DRS_CLIPPING );
D3DSTATE_TO_STR(WINED3DRS_LIGHTING );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_EXTENTS );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_AMBIENT );
D3DSTATE_TO_STR(WINED3DRS_FOGVERTEXMODE );
D3DSTATE_TO_STR(WINED3DRS_COLORVERTEX );
D3DSTATE_TO_STR(WINED3DRS_LOCALVIEWER );
D3DSTATE_TO_STR(WINED3DRS_NORMALIZENORMALS );
wined3d: Add missing render states to the dumping function.
2006-05-15 20:28:13 +02:00
D3DSTATE_TO_STR(WINED3DRS_COLORKEYBLENDENABLE );
Added a stubbed out version of query to d3d9 and wined3d. Update the d3d9 headers and creates wined3d types where d3d9 and d3d8 are incompatible.
2005-03-03 14:57:15 +01:00
D3DSTATE_TO_STR(WINED3DRS_DIFFUSEMATERIALSOURCE );
D3DSTATE_TO_STR(WINED3DRS_SPECULARMATERIALSOURCE );
D3DSTATE_TO_STR(WINED3DRS_AMBIENTMATERIALSOURCE );
D3DSTATE_TO_STR(WINED3DRS_EMISSIVEMATERIALSOURCE );
D3DSTATE_TO_STR(WINED3DRS_VERTEXBLEND );
D3DSTATE_TO_STR(WINED3DRS_CLIPPLANEENABLE );
D3DSTATE_TO_STR(WINED3DRS_SOFTWAREVERTEXPROCESSING );
D3DSTATE_TO_STR(WINED3DRS_POINTSIZE );
D3DSTATE_TO_STR(WINED3DRS_POINTSIZE_MIN );
D3DSTATE_TO_STR(WINED3DRS_POINTSPRITEENABLE );
D3DSTATE_TO_STR(WINED3DRS_POINTSCALEENABLE );
D3DSTATE_TO_STR(WINED3DRS_POINTSCALE_A );
D3DSTATE_TO_STR(WINED3DRS_POINTSCALE_B );
D3DSTATE_TO_STR(WINED3DRS_POINTSCALE_C );
D3DSTATE_TO_STR(WINED3DRS_MULTISAMPLEANTIALIAS );
D3DSTATE_TO_STR(WINED3DRS_MULTISAMPLEMASK );
D3DSTATE_TO_STR(WINED3DRS_PATCHEDGESTYLE );
D3DSTATE_TO_STR(WINED3DRS_PATCHSEGMENTS );
D3DSTATE_TO_STR(WINED3DRS_DEBUGMONITORTOKEN );
D3DSTATE_TO_STR(WINED3DRS_POINTSIZE_MAX );
D3DSTATE_TO_STR(WINED3DRS_INDEXEDVERTEXBLENDENABLE );
D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE );
D3DSTATE_TO_STR(WINED3DRS_TWEENFACTOR );
D3DSTATE_TO_STR(WINED3DRS_BLENDOP );
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
D3DSTATE_TO_STR(WINED3DRS_POSITIONDEGREE );
D3DSTATE_TO_STR(WINED3DRS_NORMALDEGREE );
wined3d: Extend debug_d3drenderstate with missing states.
2006-02-11 12:15:31 +01:00
D3DSTATE_TO_STR(WINED3DRS_SCISSORTESTENABLE );
D3DSTATE_TO_STR(WINED3DRS_SLOPESCALEDEPTHBIAS );
D3DSTATE_TO_STR(WINED3DRS_ANTIALIASEDLINEENABLE );
D3DSTATE_TO_STR(WINED3DRS_MINTESSELLATIONLEVEL );
D3DSTATE_TO_STR(WINED3DRS_MAXTESSELLATIONLEVEL );
D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_X );
D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_Y );
D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_Z );
D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_W );
D3DSTATE_TO_STR(WINED3DRS_ENABLEADAPTIVETESSELLATION);
D3DSTATE_TO_STR(WINED3DRS_TWOSIDEDSTENCILMODE );
D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILFAIL );
D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILZFAIL );
D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILPASS );
D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILFUNC );
D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE1 );
D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE2 );
D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE3 );
D3DSTATE_TO_STR(WINED3DRS_BLENDFACTOR );
D3DSTATE_TO_STR(WINED3DRS_SRGBWRITEENABLE );
D3DSTATE_TO_STR(WINED3DRS_DEPTHBIAS );
D3DSTATE_TO_STR(WINED3DRS_WRAP8 );
D3DSTATE_TO_STR(WINED3DRS_WRAP9 );
D3DSTATE_TO_STR(WINED3DRS_WRAP10 );
D3DSTATE_TO_STR(WINED3DRS_WRAP11 );
D3DSTATE_TO_STR(WINED3DRS_WRAP12 );
D3DSTATE_TO_STR(WINED3DRS_WRAP13 );
D3DSTATE_TO_STR(WINED3DRS_WRAP14 );
D3DSTATE_TO_STR(WINED3DRS_WRAP15 );
D3DSTATE_TO_STR(WINED3DRS_SEPARATEALPHABLENDENABLE );
D3DSTATE_TO_STR(WINED3DRS_SRCBLENDALPHA );
D3DSTATE_TO_STR(WINED3DRS_DESTBLENDALPHA );
D3DSTATE_TO_STR(WINED3DRS_BLENDOPALPHA );
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
#undef D3DSTATE_TO_STR
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized %u render state!\n", state);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
return "unrecognized";
}
}
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
const char* debug_d3dsamplerstate(DWORD state) {
switch (state) {
#define D3DSTATE_TO_STR(u) case u: return #u
D3DSTATE_TO_STR(WINED3DSAMP_BORDERCOLOR );
D3DSTATE_TO_STR(WINED3DSAMP_ADDRESSU );
D3DSTATE_TO_STR(WINED3DSAMP_ADDRESSV );
D3DSTATE_TO_STR(WINED3DSAMP_ADDRESSW );
D3DSTATE_TO_STR(WINED3DSAMP_MAGFILTER );
D3DSTATE_TO_STR(WINED3DSAMP_MINFILTER );
D3DSTATE_TO_STR(WINED3DSAMP_MIPFILTER );
D3DSTATE_TO_STR(WINED3DSAMP_MIPMAPLODBIAS);
D3DSTATE_TO_STR(WINED3DSAMP_MAXMIPLEVEL );
D3DSTATE_TO_STR(WINED3DSAMP_MAXANISOTROPY);
Correct a few formats that were incorrect.
2005-07-13 21:38:39 +02:00
D3DSTATE_TO_STR(WINED3DSAMP_SRGBTEXTURE );
D3DSTATE_TO_STR(WINED3DSAMP_ELEMENTINDEX );
D3DSTATE_TO_STR(WINED3DSAMP_DMAPOFFSET );
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
#undef D3DSTATE_TO_STR
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized %u sampler state!\n", state);
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
return "unrecognized";
}
}
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
const char* debug_d3dtexturestate(DWORD state) {
switch (state) {
#define D3DSTATE_TO_STR(u) case u: return #u
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
D3DSTATE_TO_STR(WINED3DTSS_COLOROP );
D3DSTATE_TO_STR(WINED3DTSS_COLORARG1 );
D3DSTATE_TO_STR(WINED3DTSS_COLORARG2 );
D3DSTATE_TO_STR(WINED3DTSS_ALPHAOP );
D3DSTATE_TO_STR(WINED3DTSS_ALPHAARG1 );
D3DSTATE_TO_STR(WINED3DTSS_ALPHAARG2 );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVMAT00 );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVMAT01 );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVMAT10 );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVMAT11 );
D3DSTATE_TO_STR(WINED3DTSS_TEXCOORDINDEX );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVLSCALE );
D3DSTATE_TO_STR(WINED3DTSS_BUMPENVLOFFSET );
D3DSTATE_TO_STR(WINED3DTSS_TEXTURETRANSFORMFLAGS );
D3DSTATE_TO_STR(WINED3DTSS_ADDRESSW );
D3DSTATE_TO_STR(WINED3DTSS_COLORARG0 );
D3DSTATE_TO_STR(WINED3DTSS_ALPHAARG0 );
D3DSTATE_TO_STR(WINED3DTSS_RESULTARG );
Correct a few formats that were incorrect.
2005-07-13 21:38:39 +02:00
D3DSTATE_TO_STR(WINED3DTSS_CONSTANT );
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
#undef D3DSTATE_TO_STR
case 12:
wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:50 +02:00
/* Note WINED3DTSS are not consecutive, so skip these */
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
return "unused";
break;
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized %u texture state!\n", state);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
return "unrecognized";
}
}
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop) {
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-27 23:40:02 +02:00
switch (d3dtop) {
#define D3DTOP_TO_STR(u) case u: return #u
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
D3DTOP_TO_STR(WINED3DTOP_DISABLE);
D3DTOP_TO_STR(WINED3DTOP_SELECTARG1);
D3DTOP_TO_STR(WINED3DTOP_SELECTARG2);
D3DTOP_TO_STR(WINED3DTOP_MODULATE);
D3DTOP_TO_STR(WINED3DTOP_MODULATE2X);
D3DTOP_TO_STR(WINED3DTOP_MODULATE4X);
D3DTOP_TO_STR(WINED3DTOP_ADD);
D3DTOP_TO_STR(WINED3DTOP_ADDSIGNED);
D3DTOP_TO_STR(WINED3DTOP_SUBTRACT);
D3DTOP_TO_STR(WINED3DTOP_ADDSMOOTH);
D3DTOP_TO_STR(WINED3DTOP_BLENDDIFFUSEALPHA);
D3DTOP_TO_STR(WINED3DTOP_BLENDTEXTUREALPHA);
D3DTOP_TO_STR(WINED3DTOP_BLENDFACTORALPHA);
D3DTOP_TO_STR(WINED3DTOP_BLENDTEXTUREALPHAPM);
D3DTOP_TO_STR(WINED3DTOP_BLENDCURRENTALPHA);
D3DTOP_TO_STR(WINED3DTOP_PREMODULATE);
D3DTOP_TO_STR(WINED3DTOP_MODULATEALPHA_ADDCOLOR);
D3DTOP_TO_STR(WINED3DTOP_MODULATECOLOR_ADDALPHA);
D3DTOP_TO_STR(WINED3DTOP_MODULATEINVALPHA_ADDCOLOR);
D3DTOP_TO_STR(WINED3DTOP_MODULATEINVCOLOR_ADDALPHA);
D3DTOP_TO_STR(WINED3DTOP_BUMPENVMAP);
D3DTOP_TO_STR(WINED3DTOP_BUMPENVMAPLUMINANCE);
D3DTOP_TO_STR(WINED3DTOP_DOTPRODUCT3);
D3DTOP_TO_STR(WINED3DTOP_MULTIPLYADD);
D3DTOP_TO_STR(WINED3DTOP_LERP);
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-27 23:40:02 +02:00
#undef D3DTOP_TO_STR
default:
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
FIXME("Unrecognized %u WINED3DTOP\n", d3dtop);
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-27 23:40:02 +02:00
return "unrecognized";
}
}
wined3d: Improve traces for D3DTRANSFORMSTATETYPE. Added debug function for WINED3DTRANSFORMSTATETYPE and changed all references from D3DTS_* to WINED3DTS_*.
2006-07-24 04:54:30 +02:00
const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) {
switch (tstype) {
#define TSTYPE_TO_STR(tstype) case tstype: return #tstype
TSTYPE_TO_STR(WINED3DTS_VIEW);
TSTYPE_TO_STR(WINED3DTS_PROJECTION);
TSTYPE_TO_STR(WINED3DTS_TEXTURE0);
TSTYPE_TO_STR(WINED3DTS_TEXTURE1);
TSTYPE_TO_STR(WINED3DTS_TEXTURE2);
TSTYPE_TO_STR(WINED3DTS_TEXTURE3);
TSTYPE_TO_STR(WINED3DTS_TEXTURE4);
TSTYPE_TO_STR(WINED3DTS_TEXTURE5);
TSTYPE_TO_STR(WINED3DTS_TEXTURE6);
TSTYPE_TO_STR(WINED3DTS_TEXTURE7);
TSTYPE_TO_STR(WINED3DTS_WORLDMATRIX(0));
#undef TSTYPE_TO_STR
default:
if (tstype > 256 && tstype < 512) {
FIXME("WINED3DTS_WORLDMATRIX(%u). 1..255 not currently supported\n", tstype);
return ("WINED3DTS_WORLDMATRIX > 0");
}
FIXME("Unrecognized %u WINED3DTS\n", tstype);
return "unrecognized";
}
}
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 14:20:47 +02:00
const char* debug_d3dpool(WINED3DPOOL Pool) {
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 14:44:57 +01:00
switch (Pool) {
#define POOL_TO_STR(p) case p: return #p;
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 14:20:47 +02:00
POOL_TO_STR(WINED3DPOOL_DEFAULT);
POOL_TO_STR(WINED3DPOOL_MANAGED);
POOL_TO_STR(WINED3DPOOL_SYSTEMMEM);
POOL_TO_STR(WINED3DPOOL_SCRATCH);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 14:44:57 +01:00
#undef POOL_TO_STR
default:
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 14:20:47 +02:00
FIXME("Unrecognized %u WINED3DPOOL!\n", Pool);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 14:44:57 +01:00
return "unrecognized";
}
}
wined3d: Add a couple of traces to the vertexdeclaration creation code.
2006-08-07 19:21:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/*****************************************************************************
* Useful functions mapping GL <-> D3D values
*/
GLenum StencilOp(DWORD op) {
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
switch(op) {
wined3d: Add D3DSTENCILOP to the WINED3D namespace.
2006-10-30 03:44:22 +01:00
case WINED3DSTENCILOP_KEEP : return GL_KEEP;
case WINED3DSTENCILOP_ZERO : return GL_ZERO;
case WINED3DSTENCILOP_REPLACE : return GL_REPLACE;
case WINED3DSTENCILOP_INCRSAT : return GL_INCR;
case WINED3DSTENCILOP_DECRSAT : return GL_DECR;
case WINED3DSTENCILOP_INVERT : return GL_INVERT;
case WINED3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT;
case WINED3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT;
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized stencil op %d\n", op);
wined3d: Fix stencil related render states.
2006-06-09 17:32:18 +02:00
return GL_KEEP;
}
}
wined3d: Use a common function for all D3DCMPFUNC -> GLenum conversions.
2006-08-25 16:28:34 +02:00
GLenum CompareFunc(DWORD func) {
wined3d: Add D3DCMPFUNC to the WINED3D namespace.
2006-10-30 03:44:58 +01:00
switch ((WINED3DCMPFUNC)func) {
case WINED3DCMP_NEVER : return GL_NEVER;
case WINED3DCMP_LESS : return GL_LESS;
case WINED3DCMP_EQUAL : return GL_EQUAL;
case WINED3DCMP_LESSEQUAL : return GL_LEQUAL;
case WINED3DCMP_GREATER : return GL_GREATER;
case WINED3DCMP_NOTEQUAL : return GL_NOTEQUAL;
case WINED3DCMP_GREATEREQUAL : return GL_GEQUAL;
case WINED3DCMP_ALWAYS : return GL_ALWAYS;
wined3d: Fix stencil related render states.
2006-06-09 17:32:18 +02:00
default:
wined3d: Add D3DCMPFUNC to the WINED3D namespace.
2006-10-30 03:44:58 +01:00
FIXME("Unrecognized WINED3DCMPFUNC value %d\n", func);
wined3d: Use a common function for all D3DCMPFUNC -> GLenum conversions.
2006-08-25 16:28:34 +02:00
return 0;
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
}
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) {
switch (d3dta) {
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_DIFFUSE:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_PRIMARY_COLOR_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_CURRENT:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
if (stage) return GL_SPARE0_NV;
else return GL_PRIMARY_COLOR_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_TEXTURE:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
if (texture_idx > -1) return GL_TEXTURE0_ARB + texture_idx;
else return GL_PRIMARY_COLOR_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_TFACTOR:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_CONSTANT_COLOR0_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_SPECULAR:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_SECONDARY_COLOR_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_TEMP:
wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:50 +02:00
/* TODO: Support WINED3DTSS_RESULTARG */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
FIXME("WINED3DTA_TEMP, not properly supported.\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_SPARE1_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
case WINED3DTA_CONSTANT:
wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace.
2006-10-11 03:52:50 +02:00
/* TODO: Support per stage constants (WINED3DTSS_CONSTANT, NV_register_combiners2) */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
FIXME("WINED3DTA_CONSTANT, not properly supported.\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_CONSTANT_COLOR1_NV;
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized texture arg %#x\n", d3dta);
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
return GL_TEXTURE;
}
}
static GLenum invert_mapping(GLenum mapping) {
if (mapping == GL_UNSIGNED_INVERT_NV) return GL_SIGNED_IDENTITY_NV;
else if (mapping == GL_SIGNED_IDENTITY_NV) return GL_UNSIGNED_INVERT_NV;
FIXME("Unhandled mapping %#x\n", mapping);
return mapping;
}
static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum* input, GLenum* mapping, GLenum *component_usage, INT texture_idx) {
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
/* The WINED3DTA_COMPLEMENT flag specifies the complement of the input should
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
* be used. */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
if (arg & WINED3DTA_COMPLEMENT) *mapping = GL_UNSIGNED_INVERT_NV;
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
else *mapping = GL_SIGNED_IDENTITY_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
/* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the input
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
* should be used for all input components. */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
if (is_alpha || arg & WINED3DTA_ALPHAREPLICATE) *component_usage = GL_ALPHA;
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
else *component_usage = GL_RGB;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
*input = d3dta_to_combiner_input(arg & WINED3DTA_SELECTMASK, stage, texture_idx);
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
}
typedef struct {
GLenum input[3];
GLenum mapping[3];
GLenum component_usage[3];
} tex_op_args;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
static BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) {
if (op == WINED3DTOP_DISABLE) return FALSE;
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
if (This->stateBlock->textures[stage]) return FALSE;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
if (arg1 == WINED3DTA_TEXTURE && op != WINED3DTOP_SELECTARG2) return TRUE;
if (arg2 == WINED3DTA_TEXTURE && op != WINED3DTOP_SELECTARG1) return TRUE;
if (arg3 == WINED3DTA_TEXTURE && (op == WINED3DTOP_MULTIPLYADD || op == WINED3DTOP_LERP)) return TRUE;
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
return FALSE;
}
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl*)iface;
tex_op_args tex_op_args = {{0}, {0}, {0}};
GLenum portion = is_alpha ? GL_ALPHA : GL_RGB;
GLenum target = GL_COMBINER0_NV + stage;
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
TRACE("stage %d, is_alpha %d, op %s, arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx);
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
/* If a texture stage references an invalid texture unit the stage just
* passes through the result from the previous stage */
if (is_invalid_op(This, stage, op, arg1, arg2, arg3)) {
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
arg1 = WINED3DTA_CURRENT;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
op = WINED3DTOP_SELECTARG1;
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
}
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
get_src_and_opr_nvrc(stage, arg1, is_alpha, &tex_op_args.input[0],
&tex_op_args.mapping[0], &tex_op_args.component_usage[0], texture_idx);
get_src_and_opr_nvrc(stage, arg2, is_alpha, &tex_op_args.input[1],
&tex_op_args.mapping[1], &tex_op_args.component_usage[1], texture_idx);
get_src_and_opr_nvrc(stage, arg3, is_alpha, &tex_op_args.input[2],
&tex_op_args.mapping[2], &tex_op_args.component_usage[2], texture_idx);
ENTER_GL();
switch(op)
{
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_DISABLE:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Only for alpha */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (!is_alpha) ERR("Shouldn't be called for WINED3DTSS_COLOROP (WINED3DTOP_DISABLE)\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, prev_alpha*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_ALPHA));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SELECTARG1:
case WINED3DTOP_SELECTARG2:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg*1 */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (op == WINED3DTOP_SELECTARG1) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
} else {
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
}
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE:
case WINED3DTOP_MODULATE2X:
case WINED3DTOP_MODULATE4X:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*arg2 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
/* Output */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (op == WINED3DTOP_MODULATE) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
} else if (op == WINED3DTOP_MODULATE2X) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_SCALE_BY_TWO_NV, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
} else if (op == WINED3DTOP_MODULATE4X) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_SCALE_BY_FOUR_NV, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
}
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADD:
case WINED3DTOP_ADDSIGNED:
case WINED3DTOP_ADDSIGNED2X:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*1+arg2*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (op == WINED3DTOP_ADD) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
} else if (op == WINED3DTOP_ADDSIGNED) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_BIAS_BY_NEGATIVE_ONE_HALF_NV, GL_FALSE, GL_FALSE, GL_FALSE));
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
} else if (op == WINED3DTOP_ADDSIGNED2X) {
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_SCALE_BY_TWO_NV, GL_BIAS_BY_NEGATIVE_ONE_HALF_NV, GL_FALSE, GL_FALSE, GL_FALSE));
}
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SUBTRACT:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*1+-arg2*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[1], GL_SIGNED_NEGATE_NV, tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSMOOTH:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*1+(1-arg1)*arg2 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDDIFFUSEALPHA:
case WINED3DTOP_BLENDTEXTUREALPHA:
case WINED3DTOP_BLENDFACTORALPHA:
case WINED3DTOP_BLENDTEXTUREALPHAPM:
case WINED3DTOP_BLENDCURRENTALPHA:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
{
GLenum alpha_src = GL_PRIMARY_COLOR_NV;
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
if (op == WINED3DTOP_BLENDDIFFUSEALPHA) alpha_src = d3dta_to_combiner_input(WINED3DTA_DIFFUSE, stage, texture_idx);
else if (op == WINED3DTOP_BLENDTEXTUREALPHA) alpha_src = d3dta_to_combiner_input(WINED3DTA_TEXTURE, stage, texture_idx);
else if (op == WINED3DTOP_BLENDFACTORALPHA) alpha_src = d3dta_to_combiner_input(WINED3DTA_TFACTOR, stage, texture_idx);
else if (op == WINED3DTOP_BLENDTEXTUREALPHAPM) alpha_src = d3dta_to_combiner_input(WINED3DTA_TEXTURE, stage, texture_idx);
else if (op == WINED3DTOP_BLENDCURRENTALPHA) alpha_src = d3dta_to_combiner_input(WINED3DTA_CURRENT, stage, texture_idx);
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
else FIXME("Unhandled WINED3DTOP %s, shouldn't happen\n", debug_d3dtop(op));
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*alpha_src+arg2*(1-alpha_src) */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (op == WINED3DTOP_BLENDTEXTUREALPHAPM)
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
{
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
} else {
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
alpha_src, GL_UNSIGNED_IDENTITY_NV, GL_ALPHA));
}
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
alpha_src, GL_UNSIGNED_INVERT_NV, GL_ALPHA));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
}
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1_alpha*arg2_rgb+arg1_rgb*1 */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEALPHA_ADDCOLOR)\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATECOLOR_ADDALPHA:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1_rgb*arg2_rgb+arg1_alpha*1 */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATECOLOR_ADDALPHA)\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], tex_op_args.mapping[0], GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, (1-arg1_alpha)*arg2_rgb+arg1_rgb*1 */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEINVALPHA_ADDCOLOR)\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, (1-arg1_rgb)*arg2_rgb+arg1_alpha*1 */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEINVCOLOR_ADDALPHA)\n");
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], tex_op_args.mapping[0], GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_DOTPRODUCT3:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1 . arg2 */
/* FIXME: DX7 uses a different calculation? */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], GL_EXPAND_NORMAL_NV, tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], GL_EXPAND_NORMAL_NV, tex_op_args.component_usage[1]));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_TRUE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MULTIPLYADD:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*1+arg2*arg3 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
tex_op_args.input[2], tex_op_args.mapping[2], tex_op_args.component_usage[2]));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_LERP:
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
/* Input, arg1*arg2+(1-arg1)*arg3 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_C_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_D_NV,
tex_op_args.input[2], tex_op_args.mapping[2], tex_op_args.component_usage[2]));
/* Output */
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
default:
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
FIXME("Unhandled WINED3DTOP: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do.
2006-06-27 23:42:35 +02:00
stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx);
}
checkGLcall("set_tex_op_nvrc()\n");
LEAVE_GL();
}
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* operand) {
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
/* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the
* input should be used for all input components. The WINED3DTA_COMPLEMENT
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
* flag specifies the complement of the input should be used. */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
BOOL from_alpha = is_alpha || arg & WINED3DTA_ALPHAREPLICATE;
BOOL complement = arg & WINED3DTA_COMPLEMENT;
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
/* Calculate the operand */
if (complement) {
if (from_alpha) *operand = GL_ONE_MINUS_SRC_ALPHA;
else *operand = GL_ONE_MINUS_SRC_COLOR;
} else {
if (from_alpha) *operand = GL_SRC_ALPHA;
else *operand = GL_SRC_COLOR;
}
/* Calculate the source */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
switch (arg & WINED3DTA_SELECTMASK) {
case WINED3DTA_CURRENT: *source = GL_PREVIOUS_EXT; break;
case WINED3DTA_DIFFUSE: *source = GL_PRIMARY_COLOR_EXT; break;
case WINED3DTA_TEXTURE: *source = GL_TEXTURE; break;
case WINED3DTA_TFACTOR: *source = GL_CONSTANT_EXT; break;
case WINED3DTA_SPECULAR:
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
/*
* According to the GL_ARB_texture_env_combine specs, SPECULAR is
* 'Secondary color' and isn't supported until base GL supports it
* There is no concept of temp registers as far as I can tell
*/
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
FIXME("Unhandled texture arg WINED3DTA_SPECULAR\n");
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
*source = GL_TEXTURE;
break;
default:
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
FIXME("Unrecognized texture arg %#x\n", arg);
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
*source = GL_TEXTURE;
break;
}
}
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/* Set texture operations up - The following avoids lots of ifdefs in this routine!*/
#if defined (GL_VERSION_1_3)
# define useext(A) A
# define combine_ext 1
#elif defined (GL_EXT_texture_env_combine)
# define useext(A) A##_EXT
# define combine_ext 1
#elif defined (GL_ARB_texture_env_combine)
# define useext(A) A##_ARB
# define combine_ext 1
#else
# undef combine_ext
#endif
#if !defined(combine_ext)
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
{
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
FIXME("Requires opengl combine extensions to work\n");
return;
}
#else
/* Setup the texture operations texture stage states */
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
{
Avoid spaces before preprocessor directives, that's not portable.
2005-03-02 13:23:20 +01:00
#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
GLenum src1, src2, src3;
GLenum opr1, opr2, opr3;
GLenum comb_target;
GLenum src0_target, src1_target, src2_target;
GLenum opr0_target, opr1_target, opr2_target;
GLenum scal_target;
GLenum opr=0, invopr, src3_target, opr3_target;
BOOL Handled = FALSE;
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
ENTER_GL();
/* Note: Operations usually involve two ars, src0 and src1 and are operations of
the form (a1 <operation> a2). However, some of the more complex operations
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
take 3 parameters. Instead of the (sensible) addition of a3, Microsoft added
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
in a third parameter called a0. Therefore these are operations of the form
a0 <operation> a1 <operation> a2, ie the new parameter goes to the front.
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
However, below we treat the new (a0) parameter as src2/opr2, so in the actual
functions below, expect their syntax to differ slightly to those listed in the
manuals, ie replace arg1 with arg3, arg2 with arg1 and arg3 with arg2
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
This affects WINED3DTOP_MULTIPLYADD and WINED3DTOP_LERP */
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (isAlpha) {
comb_target = useext(GL_COMBINE_ALPHA);
src0_target = useext(GL_SOURCE0_ALPHA);
src1_target = useext(GL_SOURCE1_ALPHA);
src2_target = useext(GL_SOURCE2_ALPHA);
opr0_target = useext(GL_OPERAND0_ALPHA);
opr1_target = useext(GL_OPERAND1_ALPHA);
opr2_target = useext(GL_OPERAND2_ALPHA);
scal_target = GL_ALPHA_SCALE;
}
else {
comb_target = useext(GL_COMBINE_RGB);
src0_target = useext(GL_SOURCE0_RGB);
src1_target = useext(GL_SOURCE1_RGB);
src2_target = useext(GL_SOURCE2_RGB);
opr0_target = useext(GL_OPERAND0_RGB);
opr1_target = useext(GL_OPERAND1_RGB);
opr2_target = useext(GL_OPERAND2_RGB);
scal_target = useext(GL_RGB_SCALE);
}
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
/* If a texture stage references an invalid texture unit the stage just
* passes through the result from the previous stage */
if (is_invalid_op(This, Stage, op, arg1, arg2, arg3)) {
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
arg1 = WINED3DTA_CURRENT;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
op = WINED3DTOP_SELECTARG1;
wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage.
2006-07-12 00:44:03 +02:00
}
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
/* From MSDN (WINED3DTSS_ALPHAARG1) :
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
The default argument is WINED3DTA_TEXTURE. If no texture is set for this stage,
then the default argument is WINED3DTA_DIFFUSE.
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
FIXME? If texture added/removed, may need to reset back as well? */
wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 12:05:00 +02:00
if (isAlpha && This->stateBlock->textures[Stage] == NULL && arg1 == WINED3DTA_TEXTURE) {
get_src_and_opr(WINED3DTA_DIFFUSE, isAlpha, &src1, &opr1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
} else {
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
get_src_and_opr(arg1, isAlpha, &src1, &opr1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file.
2006-06-10 23:49:09 +02:00
get_src_and_opr(arg2, isAlpha, &src2, &opr2);
get_src_and_opr(arg3, isAlpha, &src3, &opr3);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
TRACE("ct(%x), 1:(%x,%x), 2:(%x,%x), 3:(%x,%x)\n", comb_target, src1, opr1, src2, opr2, src3, opr3);
Handled = TRUE; /* Assume will be handled */
/* Other texture operations require special extensions: */
if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) {
if (isAlpha) {
opr = GL_SRC_ALPHA;
invopr = GL_ONE_MINUS_SRC_ALPHA;
src3_target = GL_SOURCE3_ALPHA_NV;
opr3_target = GL_OPERAND3_ALPHA_NV;
} else {
opr = GL_SRC_COLOR;
invopr = GL_ONE_MINUS_SRC_COLOR;
src3_target = GL_SOURCE3_RGB_NV;
opr3_target = GL_OPERAND3_RGB_NV;
}
switch (op) {
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_DISABLE: /* Only for alpha */
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, GL_PREVIOUS_EXT);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SELECTARG1: /* = a1 * 1 + 0 * 0 */
case WINED3DTOP_SELECTARG2: /* = a2 * 1 + 0 * 0 */
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
if (op == WINED3DTOP_SELECTARG1) {
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
} else {
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src0_target, src2);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src0_target, src2");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr2");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
break;
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE2X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE4X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_ZERO);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 4);
checkGLcall("GL_TEXTURE_ENV, scal_target, 4");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADD:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSIGNED:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSIGNED2X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSMOOTH:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, src1);
checkGLcall("GL_TEXTURE_ENV, src3_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDDIFFUSEALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, useext(GL_PRIMARY_COLOR));
checkGLcall("GL_TEXTURE_ENV, src1_target, useext(GL_PRIMARY_COLOR)");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, useext(GL_PRIMARY_COLOR));
checkGLcall("GL_TEXTURE_ENV, src3_target, useext(GL_PRIMARY_COLOR)");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDTEXTUREALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_TEXTURE);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_TEXTURE");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_TEXTURE);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_TEXTURE");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDFACTORALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, useext(GL_CONSTANT));
checkGLcall("GL_TEXTURE_ENV, src1_target, useext(GL_CONSTANT)");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, useext(GL_CONSTANT));
checkGLcall("GL_TEXTURE_ENV, src3_target, useext(GL_CONSTANT)");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDTEXTUREALPHAPM:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_TEXTURE);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_TEXTURE");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr3_target, GL_ONE_MINUS_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1); /* a0 = src1/opr1 */
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1"); /* a1 = 1 (see docs) */
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2); /* a2 = arg2 */
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); /* a3 = src1 alpha */
glTexEnvi(GL_TEXTURE_ENV, src3_target, src1);
checkGLcall("GL_TEXTURE_ENV, src3_target, src1");
switch (opr) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATECOLOR_ADDALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, src1);
checkGLcall("GL_TEXTURE_ENV, src3_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MULTIPLYADD:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src3);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr3);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, GL_ZERO);
checkGLcall("GL_TEXTURE_ENV, src1_target, GL_ZERO");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, invopr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, invopr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src3_target, src2);
checkGLcall("GL_TEXTURE_ENV, src3_target, src3");
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr3");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BUMPENVMAP:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
{
if (GL_SUPPORT(NV_TEXTURE_SHADER)) {
/*
texture unit 0: GL_TEXTURE_2D
texture unit 1: GL_DOT_PRODUCT_NV
texture unit 2: GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV
texture unit 3: GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV
*/
float m[2][2];
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
union {
float f;
DWORD d;
} tmpvalue;
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT00];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
m[0][0] = tmpvalue.f;
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT01];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
m[0][1] = tmpvalue.f;
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT10];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
m[1][0] = tmpvalue.f;
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT11];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
m[1][1] = tmpvalue.f;
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/*FIXME("Stage %d matrix is (%.2f,%.2f),(%.2f,%.2f)\n", Stage, m[0][0], m[0][1], m[1][0], m[1][0]);*/
wined3d: Comparing BOOLs against FALSE is redundant.
2006-09-26 20:31:58 +02:00
if (!This->texture_shader_active) {
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
This->texture_shader_active = TRUE;
glEnable(GL_TEXTURE_SHADER_NV);
}
/*
glEnable(GL_REGISTER_COMBINERS_NV);
glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 1);
glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_A_NV, GL_TEXTURE0_ARB, GL_SIGNED_IDENTITY_NV, GL_RGB);
glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_B_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_RGB);
glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_C_NV, GL_TEXTURE2_ARB, GL_SIGNED_IDENTITY_NV, GL_RGB);
glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_D_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_RGB);
glCombinerOutputNV (GL_COMBINER0_NV, GL_RGB, GL_DISCARD_NV, GL_DISCARD_NV, GL_PRIMARY_COLOR_NV, 0, 0, 0, 0, 0);
glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_A_NV, GL_TEXTURE0_ARB, GL_SIGNED_IDENTITY_NV, GL_ALPHA);
glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_B_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_ALPHA);
glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_C_NV, GL_TEXTURE2_ARB, GL_SIGNED_IDENTITY_NV, GL_ALPHA);
glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_D_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_ALPHA);
glCombinerOutputNV (GL_COMBINER0_NV, GL_ALPHA, GL_DISCARD_NV, GL_DISCARD_NV, GL_PRIMARY_COLOR_NV, 0, 0, 0, 0, 0);
glDisable (GL_PER_STAGE_CONSTANTS_NV);
glCombinerParameteriNV (GL_COLOR_SUM_CLAMP_NV, 0);
glFinalCombinerInputNV (GL_VARIABLE_A_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_B_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_C_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_D_NV, GL_PRIMARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_E_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_F_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
glFinalCombinerInputNV (GL_VARIABLE_G_NV, GL_PRIMARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_ALPHA);
*/
/*
int i;
for (i = 0; i < Stage; i++) {
if (GL_SUPPORT(ARB_MULTITEXTURE)) {
GL_ACTIVETEXTURE(i);
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
checkGLcall("Activate texture..");
} else if (i>0) {
FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n");
}
}
*/
/*
GL_ACTIVETEXTURE(Stage - 1);
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
*/
/*
GL_ACTIVETEXTURE(Stage);
checkGLcall("Activate texture.. to update const color");
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_OFFSET_TEXTURE_2D_NV);
checkGLcall("glTexEnv");
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + Stage - 1);
checkGLcall("glTexEnv");
glTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, (float*)&m[0]);
checkGLcall("glTexEnv");
*/
LEAVE_GL();
return;
}
}
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BUMPENVMAPLUMINANCE:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
default:
Handled = FALSE;
}
if (Handled) {
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE4_NV);
checkGLcall("GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE4_NV");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
LEAVE_GL();
return;
}
} /* GL_NV_texture_env_combine4 */
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
Handled = TRUE; /* Again, assume handled */
switch (op) {
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_DISABLE: /* Only for alpha */
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, GL_PREVIOUS_EXT);
checkGLcall("GL_TEXTURE_ENV, src0_target, GL_PREVIOUS_EXT");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr0_target, GL_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SELECTARG1:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SELECTARG2:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src2);
checkGLcall("GL_TEXTURE_ENV, src0_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE2X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATE4X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 4);
checkGLcall("GL_TEXTURE_ENV, scal_target, 4");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADD:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSIGNED:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext((GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSIGNED2X:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SUBTRACT:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ARB_TEXTURE_ENV_COMBINE)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_SUBTRACT);
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_SUBTRACT)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else {
FIXME("This version of opengl does not support GL_SUBTRACT\n");
}
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDDIFFUSEALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, useext(GL_PRIMARY_COLOR));
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_PRIMARY_COLOR");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDTEXTUREALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, GL_TEXTURE);
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_TEXTURE");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDFACTORALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, useext(GL_CONSTANT));
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_CONSTANT");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDCURRENTALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, useext(GL_PREVIOUS));
checkGLcall("GL_TEXTURE_ENV, src2_target, GL_PREVIOUS");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_DOTPRODUCT3:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_ARB);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_ARB");
} else if (GL_SUPPORT(EXT_TEXTURE_ENV_DOT3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_EXT);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_EXT");
} else {
FIXME("This version of opengl does not support GL_DOT3\n");
}
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_LERP:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src2);
checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src3);
checkGLcall("GL_TEXTURE_ENV, src2_target, src3");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr3);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr3");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSMOOTH:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_BLENDTEXTUREALPHAPM:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, GL_TEXTURE);
checkGLcall("GL_TEXTURE_ENV, src0_target, GL_TEXTURE");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_ALPHA);
checkGLcall("GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_APHA");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATECOLOR_ADDALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break;
case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
switch (opr1) {
case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
case GL_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
case GL_ONE_MINUS_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
}
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_MULTIPLYADD:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src3);
checkGLcall("GL_TEXTURE_ENV, src0_target, src3");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr3);
checkGLcall("GL_TEXTURE_ENV, opr0_target, opr3");
glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1");
glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
break;
default:
Handled = FALSE;
}
if (Handled) {
BOOL combineOK = TRUE;
if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) {
DWORD op2;
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (isAlpha) {
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
op2 = This->stateBlock->textureState[Stage][WINED3DTSS_COLOROP];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
} else {
Add support for samplers. Switch from using d3d9 constants to wined3d constants so that there's no recursive dependencies.
2005-06-24 13:53:07 +02:00
op2 = This->stateBlock->textureState[Stage][WINED3DTSS_ALPHAOP];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/* Note: If COMBINE4 in effect can't go back to combine! */
switch (op2) {
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_ADDSMOOTH:
case WINED3DTOP_BLENDTEXTUREALPHAPM:
case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
case WINED3DTOP_MODULATECOLOR_ADDALPHA:
case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
case WINED3DTOP_MULTIPLYADD:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/* Ignore those implemented in both cases */
switch (op) {
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 05:33:03 +02:00
case WINED3DTOP_SELECTARG1:
case WINED3DTOP_SELECTARG2:
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
combineOK = FALSE;
Handled = FALSE;
break;
default:
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-27 23:40:02 +02:00
FIXME("Can't use COMBINE4 and COMBINE together, thisop=%s, otherop=%s, isAlpha(%d)\n", debug_d3dtop(op), debug_d3dtop(op2), isAlpha);
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
LEAVE_GL();
return;
}
}
}
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
if (combineOK) {
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, useext(GL_COMBINE));
checkGLcall("GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, useext(GL_COMBINE)");
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
LEAVE_GL();
return;
}
}
LEAVE_GL();
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
/* After all the extensions, if still unhandled, report fixme */
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-27 23:40:02 +02:00
FIXME("Unhandled texture operation %s\n", debug_d3dtop(op));
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
#undef GLINFO_LOCATION
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
#endif
/* Setup this textures matrix according to the texture flags*/
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords)
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
{
float mat[16];
glMatrixMode(GL_TEXTURE);
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
checkGLcall("glMatrixMode(GL_TEXTURE)");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 05:36:09 +02:00
if (flags == WINED3DTTFF_DISABLE) {
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glLoadIdentity();
checkGLcall("glLoadIdentity()");
return;
}
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 05:36:09 +02:00
if (flags == (WINED3DTTFF_COUNT1|WINED3DTTFF_PROJECTED)) {
ERR("Invalid texture transform flags: WINED3DTTFF_COUNT1|WINED3DTTFF_PROJECTED\n");
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
return;
}
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
memcpy(mat, smat, 16 * sizeof(float));
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 05:36:09 +02:00
switch (flags & ~WINED3DTTFF_PROJECTED) {
case WINED3DTTFF_COUNT1: mat[1] = mat[5] = mat[13] = 0;
case WINED3DTTFF_COUNT2: mat[2] = mat[6] = mat[10] = mat[14] = 0;
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
default: mat[3] = mat[7] = mat[11] = 0, mat[15] = 1;
}
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 05:36:09 +02:00
if (flags & WINED3DTTFF_PROJECTED) {
switch (flags & ~WINED3DTTFF_PROJECTED) {
case WINED3DTTFF_COUNT2:
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
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;
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 05:36:09 +02:00
case WINED3DTTFF_COUNT3:
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
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;
}
} else if(!calculatedCoords) { /* under directx the R/Z coord can be used for translation, under opengl we use the Q coord instead */
mat[12] = mat[8];
mat[13] = mat[9];
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
}
DirectX uses a R/Z transform to translate a texture but under OpenGL a Q transform must be used instead.
2005-07-26 22:01:29 +02:00
Add {G,S}etRenderState and {G,S}etTextureStageState support, and ensure the stateblock is fully populated at device startup.
2004-12-13 14:35:38 +01:00
glLoadMatrixf(mat);
checkGLcall("glLoadMatrixf(mat)");
}
Add render target support, and ensure there is a front and back buffer created during device creation.
2005-01-09 18:37:02 +01:00
#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
/* Convertes a D3D format into a OpenGL configuration format */
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 03:51:13 +02:00
int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate){
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
#define PUSH1(att) attribs[(*nAttribs)++] = (att);
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
#define PUSH2(att,value) attribs[(*nAttribs)++] = (att); attribs[(*nAttribs)++] = (value);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
/*We need to do some Card specific stuff in here at some point,
Assorted spelling fixes.
2005-11-23 20:14:43 +01:00
D3D now supports floating point format buffers, and there are a number of different OpelGl ways of managing these e.g.
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
GLX_ATI_pixel_format_float
*/
switch (BackBufferFormat) {
/* color buffer */
case WINED3DFMT_P8:
PUSH2(GLX_RENDER_TYPE, GLX_COLOR_INDEX_BIT);
PUSH2(GLX_BUFFER_SIZE, 8);
PUSH2(GLX_DOUBLEBUFFER, TRUE);
break;
case WINED3DFMT_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 WINED3DFMT_A1R5G5B5:
PUSH2(GLX_ALPHA_SIZE, 1);
case WINED3DFMT_X1R5G5B5:
PUSH2(GLX_RED_SIZE, 5);
PUSH2(GLX_GREEN_SIZE, 5);
PUSH2(GLX_BLUE_SIZE, 5);
break;
case WINED3DFMT_R5G6B5:
PUSH2(GLX_RED_SIZE, 5);
PUSH2(GLX_GREEN_SIZE, 6);
PUSH2(GLX_BLUE_SIZE, 5);
break;
case WINED3DFMT_A4R4G4B4:
PUSH2(GLX_ALPHA_SIZE, 4);
case WINED3DFMT_X4R4G4B4:
PUSH2(GLX_RED_SIZE, 4);
PUSH2(GLX_GREEN_SIZE, 4);
PUSH2(GLX_BLUE_SIZE, 4);
break;
case WINED3DFMT_A8R8G8B8:
PUSH2(GLX_ALPHA_SIZE, 8);
case WINED3DFMT_R8G8B8:
case WINED3DFMT_X8R8G8B8:
PUSH2(GLX_RED_SIZE, 8);
PUSH2(GLX_GREEN_SIZE, 8);
PUSH2(GLX_BLUE_SIZE, 8);
break;
Added A2R10G10B10 and D3DFMT_D24FS8 modes to all other functions.
2005-09-07 11:25:26 +02:00
case WINED3DFMT_A2R10G10B10:
PUSH2(GLX_ALPHA_SIZE, 2);
PUSH2(GLX_RED_SIZE, 10);
PUSH2(GLX_GREEN_SIZE, 10);
PUSH2(GLX_BLUE_SIZE, 10);
break;
wined3d: Texture format corrections. - add missing GL type and make GL cfg entries for A16B16G16R16 - correct L16 type to UNSIGNED_SHORT (..16 = short, not byte) - change internal format for X8R8G8B8 from GL_RGB to GL_RGB8 which seems more correct
2006-04-21 10:04:53 +02:00
case WINED3DFMT_A16B16G16R16:
PUSH2(GLX_ALPHA_SIZE, 16);
PUSH2(GLX_RED_SIZE, 16);
PUSH2(GLX_GREEN_SIZE, 16);
PUSH2(GLX_BLUE_SIZE, 16);
break;
wined3d: Add some more debugging info. Adds more debugging FIXME's if a specific WINED3DFMT_??? isn't supported.
2006-04-10 02:45:58 +02:00
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
default:
wined3d: Add some more debugging info. Adds more debugging FIXME's if a specific WINED3DFMT_??? isn't supported.
2006-04-10 02:45:58 +02:00
FIXME("Unsupported color format: %s\n", debug_d3dformat(BackBufferFormat));
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
break;
}
if(!alternate){
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
switch (StencilBufferFormat) {
wined3d: Add case 0 to switch statement and fix the fixme. Screwed up a copy/paste from one of my recent patches. This eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0 as the Stencil format. Also, it changes the FIXME to print the correct variable.
2006-04-13 01:42:55 +02:00
case 0:
break;
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
case WINED3DFMT_D16_LOCKABLE:
case WINED3DFMT_D16:
PUSH2(GLX_DEPTH_SIZE, 16);
break;
case WINED3DFMT_D15S1:
PUSH2(GLX_DEPTH_SIZE, 15);
PUSH2(GLX_STENCIL_SIZE, 1);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
/*Does openGl support a 1bit stencil?, I've seen it used elsewhere
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
e.g. http://www.ks.uiuc.edu/Research/vmd/doxygen/OpenGLDisplayDevice_8C-source.html*/
break;
case WINED3DFMT_D24X8:
PUSH2(GLX_DEPTH_SIZE, 24);
break;
case WINED3DFMT_D24X4S4:
PUSH2(GLX_DEPTH_SIZE, 24);
PUSH2(GLX_STENCIL_SIZE, 4);
break;
case WINED3DFMT_D24S8:
PUSH2(GLX_DEPTH_SIZE, 24);
PUSH2(GLX_STENCIL_SIZE, 8);
break;
Added A2R10G10B10 and D3DFMT_D24FS8 modes to all other functions.
2005-09-07 11:25:26 +02:00
case WINED3DFMT_D24FS8:
PUSH2(GLX_DEPTH_SIZE, 24);
PUSH2(GLX_STENCIL_SIZE, 8);
break;
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
case WINED3DFMT_D32:
PUSH2(GLX_DEPTH_SIZE, 32);
break;
default:
wined3d: Add case 0 to switch statement and fix the fixme. Screwed up a copy/paste from one of my recent patches. This eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0 as the Stencil format. Also, it changes the FIXME to print the correct variable.
2006-04-13 01:42:55 +02:00
FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat));
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
break;
}
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
} else { /* it the device doesn't support the 'exact' format, try to find something close */
switch (StencilBufferFormat) {
wined3d: Add case 0 to switch statement and fix the fixme. Screwed up a copy/paste from one of my recent patches. This eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0 as the Stencil format. Also, it changes the FIXME to print the correct variable.
2006-04-13 01:42:55 +02:00
case 0:
break;
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
case WINED3DFMT_D16_LOCKABLE:
case WINED3DFMT_D16:
PUSH2(GLX_DEPTH_SIZE, 1);
break;
case WINED3DFMT_D15S1:
PUSH2(GLX_DEPTH_SIZE, 1);
PUSH2(GLX_STENCIL_SIZE, 1);
Tidy up some comments and formatting.
2005-07-13 16:15:54 +02:00
/*Does openGl support a 1bit stencil?, I've seen it used elsewhere
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
e.g. http://www.ks.uiuc.edu/Research/vmd/doxygen/OpenGLDisplayDevice_8C-source.html*/
break;
case WINED3DFMT_D24X8:
PUSH2(GLX_DEPTH_SIZE, 1);
break;
case WINED3DFMT_D24X4S4:
PUSH2(GLX_DEPTH_SIZE, 1);
PUSH2(GLX_STENCIL_SIZE, 1);
break;
case WINED3DFMT_D24S8:
PUSH2(GLX_DEPTH_SIZE, 1);
PUSH2(GLX_STENCIL_SIZE, 1);
break;
Added A2R10G10B10 and D3DFMT_D24FS8 modes to all other functions.
2005-09-07 11:25:26 +02:00
case WINED3DFMT_D24FS8:
PUSH2(GLX_DEPTH_SIZE, 1);
PUSH2(GLX_STENCIL_SIZE, 1);
break;
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
case WINED3DFMT_D32:
PUSH2(GLX_DEPTH_SIZE, 1);
break;
default:
wined3d: Add case 0 to switch statement and fix the fixme. Screwed up a copy/paste from one of my recent patches. This eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0 as the Stencil format. Also, it changes the FIXME to print the correct variable.
2006-04-13 01:42:55 +02:00
FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat));
Implement render targets using either textures, swapchains or standalone surfaces.
2005-07-07 22:35:05 +02:00
break;
}
}
return *nAttribs;
}
Add render target support, and ensure there is a front and back buffer created during device creation.
2005-01-09 18:37:02 +01:00
#undef GLINFO_LOCATION
wined3d: Implement IWineD3DDevice::EnumDisplayModes.
2006-04-18 23:04:51 +02:00
/* DirectDraw stuff */
WINED3DFORMAT pixelformat_for_depth(DWORD depth) {
switch(depth) {
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 03:51:13 +02:00
case 8: return WINED3DFMT_P8; break;
wined3d: Implement IWineD3DDevice::EnumDisplayModes.
2006-04-18 23:04:51 +02:00
case 15: return WINED3DFMT_X1R5G5B5; break;
case 16: return WINED3DFMT_R5G6B5; break;
case 24: return WINED3DFMT_R8G8B8; break;
case 32: return WINED3DFMT_X8R8G8B8; break;
default: return WINED3DFMT_UNKNOWN;
}
}
wined3d: Implement IWineD3DSurface::GetDC and IWineD3DSurface::ReleaseDC.
2006-05-06 18:08:33 +02:00
wined3d: Merge D3DMATRIX types into one type in WINED3D namespace.
2006-10-12 08:21:39 +02:00
void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2) {
WINED3DMATRIX temp;
wined3d: Implement IWineD3DDevice::ProcessVertices.
2006-05-12 22:21:31 +02:00
/* Now do the multiplication 'by hand'.
I know that all this could be optimised, but this will be done later :-) */
temp.u.s._11 = (src1->u.s._11 * src2->u.s._11) + (src1->u.s._21 * src2->u.s._12) + (src1->u.s._31 * src2->u.s._13) + (src1->u.s._41 * src2->u.s._14);
temp.u.s._21 = (src1->u.s._11 * src2->u.s._21) + (src1->u.s._21 * src2->u.s._22) + (src1->u.s._31 * src2->u.s._23) + (src1->u.s._41 * src2->u.s._24);
temp.u.s._31 = (src1->u.s._11 * src2->u.s._31) + (src1->u.s._21 * src2->u.s._32) + (src1->u.s._31 * src2->u.s._33) + (src1->u.s._41 * src2->u.s._34);
temp.u.s._41 = (src1->u.s._11 * src2->u.s._41) + (src1->u.s._21 * src2->u.s._42) + (src1->u.s._31 * src2->u.s._43) + (src1->u.s._41 * src2->u.s._44);
temp.u.s._12 = (src1->u.s._12 * src2->u.s._11) + (src1->u.s._22 * src2->u.s._12) + (src1->u.s._32 * src2->u.s._13) + (src1->u.s._42 * src2->u.s._14);
temp.u.s._22 = (src1->u.s._12 * src2->u.s._21) + (src1->u.s._22 * src2->u.s._22) + (src1->u.s._32 * src2->u.s._23) + (src1->u.s._42 * src2->u.s._24);
temp.u.s._32 = (src1->u.s._12 * src2->u.s._31) + (src1->u.s._22 * src2->u.s._32) + (src1->u.s._32 * src2->u.s._33) + (src1->u.s._42 * src2->u.s._34);
temp.u.s._42 = (src1->u.s._12 * src2->u.s._41) + (src1->u.s._22 * src2->u.s._42) + (src1->u.s._32 * src2->u.s._43) + (src1->u.s._42 * src2->u.s._44);
temp.u.s._13 = (src1->u.s._13 * src2->u.s._11) + (src1->u.s._23 * src2->u.s._12) + (src1->u.s._33 * src2->u.s._13) + (src1->u.s._43 * src2->u.s._14);
temp.u.s._23 = (src1->u.s._13 * src2->u.s._21) + (src1->u.s._23 * src2->u.s._22) + (src1->u.s._33 * src2->u.s._23) + (src1->u.s._43 * src2->u.s._24);
temp.u.s._33 = (src1->u.s._13 * src2->u.s._31) + (src1->u.s._23 * src2->u.s._32) + (src1->u.s._33 * src2->u.s._33) + (src1->u.s._43 * src2->u.s._34);
temp.u.s._43 = (src1->u.s._13 * src2->u.s._41) + (src1->u.s._23 * src2->u.s._42) + (src1->u.s._33 * src2->u.s._43) + (src1->u.s._43 * src2->u.s._44);
temp.u.s._14 = (src1->u.s._14 * src2->u.s._11) + (src1->u.s._24 * src2->u.s._12) + (src1->u.s._34 * src2->u.s._13) + (src1->u.s._44 * src2->u.s._14);
temp.u.s._24 = (src1->u.s._14 * src2->u.s._21) + (src1->u.s._24 * src2->u.s._22) + (src1->u.s._34 * src2->u.s._23) + (src1->u.s._44 * src2->u.s._24);
temp.u.s._34 = (src1->u.s._14 * src2->u.s._31) + (src1->u.s._24 * src2->u.s._32) + (src1->u.s._34 * src2->u.s._33) + (src1->u.s._44 * src2->u.s._34);
temp.u.s._44 = (src1->u.s._14 * src2->u.s._41) + (src1->u.s._24 * src2->u.s._42) + (src1->u.s._34 * src2->u.s._43) + (src1->u.s._44 * src2->u.s._44);
/* And copy the new matrix in the good storage.. */
memcpy(dest, &temp, 16 * sizeof(float));
}
DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) {
DWORD size = 0;
int i;
int numTextures = (d3dvtVertexType & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT;
if (d3dvtVertexType & D3DFVF_NORMAL) size += 3 * sizeof(float);
if (d3dvtVertexType & D3DFVF_DIFFUSE) size += sizeof(DWORD);
if (d3dvtVertexType & D3DFVF_SPECULAR) size += sizeof(DWORD);
if (d3dvtVertexType & D3DFVF_PSIZE) size += sizeof(DWORD);
switch (d3dvtVertexType & D3DFVF_POSITION_MASK) {
case D3DFVF_XYZ: size += 3 * sizeof(float); break;
case D3DFVF_XYZRHW: size += 4 * sizeof(float); break;
default: TRACE(" matrix weighting not handled yet...\n");
}
for (i = 0; i < numTextures; i++) {
size += GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, i) * sizeof(float);
}
return size;
}
wined3d: Implement IWineGDISurface.
2006-05-13 22:22:16 +02:00
wined3d: OpengGL accelerated blits. Implement some basic opengl accelerated blts from and to render targets. It's not perfect yet, but enought to make some D3D apps happy. For now the only supported operations are: - Full screen back -> Front buffer: Just call present - Offscreen surface -> render target - Render target -> offscreen surface(slow) - render target colorfill
2006-05-23 00:48:54 +02:00
/***********************************************************************
* CalculateTexRect
*
* Calculates the dimensions of the opengl texture used for blits.
* Handled oversized opengl textures and updates the source rectangle
* accordingly
*
* Params:
* This: Surface to operate on
* Rect: Requested rectangle
*
* Returns:
* TRUE if the texture part can be loaded,
* FALSE otherwise
*
*********************************************************************/
#define GLINFO_LOCATION ((IWineD3DImpl *)(This->resource.wineD3DDevice->wineD3D))->gl_info
BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]) {
int x1 = Rect->left, x2 = Rect->right;
int y1 = Rect->top, y2 = Rect->bottom;
GLint maxSize = GL_LIMITS(texture_size);
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
TRACE("(%p)->(%d,%d)-(%d,%d)\n", This,
wined3d: OpengGL accelerated blits. Implement some basic opengl accelerated blts from and to render targets. It's not perfect yet, but enought to make some D3D apps happy. For now the only supported operations are: - Full screen back -> Front buffer: Just call present - Offscreen surface -> render target - Render target -> offscreen surface(slow) - render target colorfill
2006-05-23 00:48:54 +02:00
Rect->left, Rect->top, Rect->right, Rect->bottom);
/* The sizes might be reversed */
if(Rect->left > Rect->right) {
x1 = Rect->right;
x2 = Rect->left;
}
if(Rect->top > Rect->bottom) {
y1 = Rect->bottom;
y2 = Rect->top;
}
/* No oversized texture? This is easy */
if(!(This->Flags & SFLAG_OVERSIZE)) {
/* Which rect from the texture do I need? */
glTexCoord[0] = (float) Rect->left / (float) This->pow2Width;
glTexCoord[2] = (float) Rect->top / (float) This->pow2Height;
glTexCoord[1] = (float) Rect->right / (float) This->pow2Width;
glTexCoord[3] = (float) Rect->bottom / (float) This->pow2Height;
return TRUE;
} else {
/* Check if we can succeed at all */
if( (x2 - x1) > maxSize ||
(y2 - y1) > maxSize ) {
TRACE("Requested rectangle is too large for gl\n");
return FALSE;
}
/* A part of the texture has to be picked. First, check if
* some texture part is loaded already, if yes try to re-use it.
* If the texture is dirty, or the part can't be used,
* re-position the part to load
*/
if(!(This->Flags & SFLAG_DIRTY)) {
if(This->glRect.left <= x1 && This->glRect.right >= x2 &&
This->glRect.top <= y1 && This->glRect.bottom >= x2 ) {
/* Ok, the rectangle is ok, re-use it */
TRACE("Using existing gl Texture\n");
} else {
/* Rectangle is not ok, dirtify the texture to reload it */
TRACE("Dirtifying texture to force reload\n");
This->Flags |= SFLAG_DIRTY;
}
}
/* Now if we are dirty(no else if!) */
if(This->Flags & SFLAG_DIRTY) {
/* Set the new rectangle. Use the following strategy:
* 1) Use as big textures as possible.
* 2) Place the texture part in the way that the requested
* part is in the middle of the texture(well, almost)
* 3) If the texture is moved over the edges of the
* surface, replace it nicely
* 4) If the coord is not limiting the texture size,
* use the whole size
*/
if((This->pow2Width) > maxSize) {
This->glRect.left = x1 - maxSize / 2;
if(This->glRect.left < 0) {
This->glRect.left = 0;
}
This->glRect.right = This->glRect.left + maxSize;
if(This->glRect.right > This->currentDesc.Width) {
This->glRect.right = This->currentDesc.Width;
This->glRect.left = This->glRect.right - maxSize;
}
} else {
This->glRect.left = 0;
This->glRect.right = This->pow2Width;
}
if(This->pow2Height > maxSize) {
This->glRect.top = x1 - GL_LIMITS(texture_size) / 2;
if(This->glRect.top < 0) This->glRect.top = 0;
This->glRect.bottom = This->glRect.left + maxSize;
if(This->glRect.bottom > This->currentDesc.Height) {
This->glRect.bottom = This->currentDesc.Height;
This->glRect.top = This->glRect.bottom - maxSize;
}
} else {
This->glRect.top = 0;
This->glRect.bottom = This->pow2Height;
}
wined3d: Win64 printf fixes.
2006-10-01 05:20:10 +02:00
TRACE("(%p): Using rect (%d,%d)-(%d,%d)\n", This,
wined3d: OpengGL accelerated blits. Implement some basic opengl accelerated blts from and to render targets. It's not perfect yet, but enought to make some D3D apps happy. For now the only supported operations are: - Full screen back -> Front buffer: Just call present - Offscreen surface -> render target - Render target -> offscreen surface(slow) - render target colorfill
2006-05-23 00:48:54 +02:00
This->glRect.left, This->glRect.top, This->glRect.right, This->glRect.bottom);
}
/* Re-calculate the rect to draw */
Rect->left -= This->glRect.left;
Rect->right -= This->glRect.left;
Rect->top -= This->glRect.top;
Rect->bottom -= This->glRect.top;
Assorted spelling, case and grammar fixes.
2006-06-23 18:18:02 +02:00
/* Get the gl coordinates. The gl rectangle is a power of 2, eigher the max size,
wined3d: OpengGL accelerated blits. Implement some basic opengl accelerated blts from and to render targets. It's not perfect yet, but enought to make some D3D apps happy. For now the only supported operations are: - Full screen back -> Front buffer: Just call present - Offscreen surface -> render target - Render target -> offscreen surface(slow) - render target colorfill
2006-05-23 00:48:54 +02:00
* or the pow2Width / pow2Height of the surface
*/
glTexCoord[0] = (float) Rect->left / (float) (This->glRect.right - This->glRect.left);
glTexCoord[2] = (float) Rect->top / (float) (This->glRect.bottom - This->glRect.top);
glTexCoord[1] = (float) Rect->right / (float) (This->glRect.right - This->glRect.left);
glTexCoord[3] = (float) Rect->bottom / (float) (This->glRect.bottom - This->glRect.top);
}
return TRUE;
}
#undef GLINFO_LOCATION