Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ab86a4e9
Commit
ab86a4e9
authored
Mar 28, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 01, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Catch D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET combos.
parent
4066c2e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
texture.c
dlls/d3d9/tests/texture.c
+2
-2
device.c
dlls/wined3d/device.c
+12
-1
No files found.
dlls/d3d9/tests/texture.c
View file @
ab86a4e9
...
...
@@ -137,7 +137,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device_ptr)
hr
=
IDirect3DDevice9_CreateCubeTexture
(
device_ptr
,
64
,
0
,
(
D3DUSAGE_RENDERTARGET
|
D3DUSAGE_AUTOGENMIPMAP
),
D3DFMT_X8R8G8B8
,
D3DPOOL_MANAGED
,
&
texture_ptr
,
0
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x
\n
"
,
ok
(
hr
==
D3DERR_INVALIDCALL
,
"IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
if
(
texture_ptr
)
IDirect3DCubeTexture9_Release
(
texture_ptr
);
texture_ptr
=
NULL
;
...
...
@@ -186,7 +186,7 @@ static void test_mipmap_gen(IDirect3DDevice9 *device)
hr
=
IDirect3DDevice9_CreateTexture
(
device
,
64
,
64
,
0
,
(
D3DUSAGE_RENDERTARGET
|
D3DUSAGE_AUTOGENMIPMAP
),
D3DFMT_X8R8G8B8
,
D3DPOOL_MANAGED
,
&
texture
,
0
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x
\n
"
,
ok
(
hr
==
D3DERR_INVALIDCALL
,
"IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
if
(
texture
)
IDirect3DTexture9_Release
(
texture
);
texture
=
NULL
;
...
...
dlls/wined3d/device.c
View file @
ab86a4e9
...
...
@@ -768,11 +768,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U
const
GlPixelFormatDesc
*
glDesc
;
getFormatDescEntry
(
Format
,
&
GLINFO_LOCATION
,
&
glDesc
);
TRACE
(
"(%p) : Width %d, Height %d, Levels %d, Usage %#x
\n
"
,
This
,
Width
,
Height
,
Levels
,
Usage
);
TRACE
(
"Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p
\n
"
,
Format
,
debug_d3dformat
(
Format
),
Pool
,
ppTexture
,
pSharedHandle
,
parent
);
if
((
Usage
&
(
WINED3DUSAGE_AUTOGENMIPMAP
|
WINED3DUSAGE_RENDERTARGET
))
==
(
WINED3DUSAGE_AUTOGENMIPMAP
|
WINED3DUSAGE_RENDERTARGET
))
{
WARN
(
"Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
/* TODO: It should only be possible to create textures for formats
that are reported as supported */
if
(
WINED3DFMT_UNKNOWN
>=
Format
)
{
...
...
@@ -1039,6 +1044,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface
const
GlPixelFormatDesc
*
glDesc
;
getFormatDescEntry
(
Format
,
&
GLINFO_LOCATION
,
&
glDesc
);
if
((
Usage
&
(
WINED3DUSAGE_AUTOGENMIPMAP
|
WINED3DUSAGE_RENDERTARGET
))
==
(
WINED3DUSAGE_AUTOGENMIPMAP
|
WINED3DUSAGE_RENDERTARGET
))
{
WARN
(
"Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
/* TODO: It should only be possible to create textures for formats
that are reported as supported */
if
(
WINED3DFMT_UNKNOWN
>=
Format
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment