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
b554cdbb
Commit
b554cdbb
authored
Jul 17, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jul 24, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d: D3DDECLTYPE_UNUSED is not valid in vertex declarations.
parent
b127647b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
0 deletions
+61
-0
vertexdeclaration.c
dlls/d3d9/tests/vertexdeclaration.c
+55
-0
vertexdeclaration.c
dlls/wined3d/vertexdeclaration.c
+6
-0
No files found.
dlls/d3d9/tests/vertexdeclaration.c
View file @
b554cdbb
...
@@ -786,6 +786,60 @@ static void test_vertex_declaration_alignment(
...
@@ -786,6 +786,60 @@ static void test_vertex_declaration_alignment(
}
}
}
}
static
void
test_unused_type
(
IDirect3DDevice9
*
device
)
{
HRESULT
hr
;
IDirect3DVertexDeclaration9
*
result_decl
=
NULL
;
int
i
;
static
const
D3DVERTEXELEMENT9
test_elements
[][
3
]
=
{
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
0
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_COLOR
,
0
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
0
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_TEXCOORD
,
0
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
0
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_TEXCOORD
,
1
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
0
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_TEXCOORD
,
12
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
1
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_TEXCOORD
,
12
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
0
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_NORMAL
,
0
},
D3DDECL_END
()
},
{
{
0
,
0
,
D3DDECLTYPE_FLOAT3
,
0
,
D3DDECLUSAGE_POSITION
,
0
},
{
1
,
16
,
D3DDECLTYPE_UNUSED
,
0
,
D3DDECLUSAGE_NORMAL
,
0
},
D3DDECL_END
()
},
};
for
(
i
=
0
;
i
<
sizeof
(
test_elements
)
/
sizeof
(
test_elements
[
0
]);
i
++
)
{
result_decl
=
NULL
;
hr
=
IDirect3DDevice9_CreateVertexDeclaration
(
device
,
test_elements
[
i
],
&
result_decl
);
ok
(
hr
==
E_FAIL
,
"CreateVertexDeclaration for declaration %d returned %#x, expected E_FAIL(%#x)
\n
"
,
i
,
hr
,
E_FAIL
);
if
(
result_decl
)
IDirect3DVertexDeclaration9_Release
(
result_decl
);
}
}
START_TEST
(
vertexdeclaration
)
START_TEST
(
vertexdeclaration
)
{
{
static
D3DVERTEXELEMENT9
simple_decl
[]
=
{
static
D3DVERTEXELEMENT9
simple_decl
[]
=
{
...
@@ -821,4 +875,5 @@ START_TEST(vertexdeclaration)
...
@@ -821,4 +875,5 @@ START_TEST(vertexdeclaration)
test_fvf_decl_conversion
(
device_ptr
);
test_fvf_decl_conversion
(
device_ptr
);
test_fvf_decl_management
(
device_ptr
);
test_fvf_decl_management
(
device_ptr
);
test_vertex_declaration_alignment
(
device_ptr
);
test_vertex_declaration_alignment
(
device_ptr
);
test_unused_type
(
device_ptr
);
}
}
dlls/wined3d/vertexdeclaration.c
View file @
b554cdbb
...
@@ -159,6 +159,12 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte
...
@@ -159,6 +159,12 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte
*/
*/
if
(
This
->
pDeclarationWine
[
i
].
Stream
>=
MAX_STREAMS
)
continue
;
if
(
This
->
pDeclarationWine
[
i
].
Stream
>=
MAX_STREAMS
)
continue
;
if
(
This
->
pDeclarationWine
[
i
].
Type
==
WINED3DDECLTYPE_UNUSED
)
{
WARN
(
"The application tries to use WINED3DDECLTYPE_UNUSED, returning E_FAIL
\n
"
);
/* The caller will release the vdecl, which will free This->pDeclarationWine */
return
E_FAIL
;
}
if
(
This
->
pDeclarationWine
[
i
].
Offset
&
0x3
)
{
if
(
This
->
pDeclarationWine
[
i
].
Offset
&
0x3
)
{
WARN
(
"Declaration element %d is not 4 byte aligned(%d), returning E_FAIL
\n
"
,
i
,
This
->
pDeclarationWine
[
i
].
Offset
);
WARN
(
"Declaration element %d is not 4 byte aligned(%d), returning E_FAIL
\n
"
,
i
,
This
->
pDeclarationWine
[
i
].
Offset
);
HeapFree
(
GetProcessHeap
(),
0
,
This
->
pDeclarationWine
);
HeapFree
(
GetProcessHeap
(),
0
,
This
->
pDeclarationWine
);
...
...
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