Roderick Colenbrander : wined3d: Add correct autogenmipmap support.
Alexandre Julliard
julliard at winehq.org
Tue Mar 18 07:44:51 CDT 2008
Module: wine
Branch: master
Commit: 0e9d02ded40810272f8cf8dfc429f8d07e9e6fb9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9d02ded40810272f8cf8dfc429f8d07e9e6fb9
Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date: Mon Mar 17 20:11:32 2008 +0100
wined3d: Add correct autogenmipmap support.
---
dlls/wined3d/directx.c | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7b90177..5cbb082 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2223,13 +2223,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
return WINED3DERR_INVALIDCALL;
}
- if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) {
- if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
- TRACE_(d3d_caps)("[FAILED] - No mipmap generation support\n");
- return WINED3DERR_NOTAVAILABLE;
- }
- }
-
if(RType == WINED3DRTYPE_CUBETEXTURE) {
/* Cubetexture allows:
* - D3DUSAGE_AUTOGENMIPMAP
@@ -2246,6 +2239,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
if(!Usage)
return WINED3D_OK;
+ if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) {
+ /* Check for automatic mipmap generation support */
+ if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
+ UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP;
+ } else {
+ /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */
+ TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n");
+ }
+ }
+
if(Usage & WINED3DUSAGE_RENDERTARGET) {
if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) {
UsageCaps |= WINED3DUSAGE_RENDERTARGET;
@@ -2328,6 +2331,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
if(!Usage)
return WINED3D_OK;
+ if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) {
+ /* Check for automatic mipmap generation support */
+ if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
+ UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP;
+ } else {
+ /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */
+ TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n");
+ }
+ }
+
if(Usage & WINED3DUSAGE_RENDERTARGET) {
if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) {
UsageCaps |= WINED3DUSAGE_RENDERTARGET;
@@ -2631,10 +2644,17 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
break;
}
-
-
- TRACE_(d3d_caps)("[FAILED]\n");
- return WINED3DERR_NOTAVAILABLE;
+ /* When the UsageCaps exactly matches Usage return WINED3D_OK except for the situation in which
+ * WINED3DUSAGE_AUTOGENMIPMAP isn't around, then WINED3DOK_NOAUTOGEN is returned if all the other
+ * usage flags match. */
+ if(UsageCaps == Usage) {
+ return WINED3D_OK;
+ } else if((UsageCaps == (Usage & ~WINED3DUSAGE_AUTOGENMIPMAP)) && (Usage & WINED3DUSAGE_AUTOGENMIPMAP)){
+ return WINED3DOK_NOAUTOGEN;
+ } else {
+ TRACE_(d3d_caps)("[FAILED] - Usage=%#08x requested but only %#08x is available\n", Usage, UsageCaps);
+ return WINED3DERR_NOTAVAILABLE;
+ }
}
static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,
More information about the wine-cvs
mailing list