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
cff217f9
Commit
cff217f9
authored
Sep 13, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[].
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
05792f64
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
13 deletions
+5
-13
utils.c
dlls/wined3d/utils.c
+5
-13
No files found.
dlls/wined3d/utils.c
View file @
cff217f9
...
...
@@ -624,8 +624,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] =
{
WINED3DFMT_R10G10B10X2_SNORM
,
WINED3D_FFP_EMIT_DEC3N
,
GL_SHORT
},
{
WINED3DFMT_R10G10B10A2_UNORM
,
WINED3D_FFP_EMIT_INVALID
,
GL_UNSIGNED_INT_2_10_10_10_REV
,
ARB_VERTEX_TYPE_2_10_10_10_REV
},
{
WINED3DFMT_R16G16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_2
,
GL_HALF_FLOAT
},
{
WINED3DFMT_R16G16B16A16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_4
,
GL_HALF_FLOAT
},
/* Without ARB_half_float_vertex we convert these on upload. */
{
WINED3DFMT_R16G16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_2
,
GL_FLOAT
},
{
WINED3DFMT_R16G16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_2
,
GL_HALF_FLOAT
,
ARB_HALF_FLOAT_VERTEX
},
{
WINED3DFMT_R16G16B16A16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_4
,
GL_FLOAT
},
{
WINED3DFMT_R16G16B16A16_FLOAT
,
WINED3D_FFP_EMIT_FLOAT16_4
,
GL_HALF_FLOAT
,
ARB_HALF_FLOAT_VERTEX
},
{
WINED3DFMT_R8G8B8A8_SNORM
,
WINED3D_FFP_EMIT_INVALID
,
GL_BYTE
},
{
WINED3DFMT_R8G8B8A8_SINT
,
WINED3D_FFP_EMIT_INVALID
,
GL_BYTE
},
{
WINED3DFMT_R16G16B16A16_UINT
,
WINED3D_FFP_EMIT_INVALID
,
GL_UNSIGNED_SHORT
},
...
...
@@ -3556,17 +3559,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_
format
->
color_fixup
=
create_complex_fixup_desc
(
COMPLEX_FIXUP_P8
);
}
if
(
!
gl_info
->
supported
[
ARB_HALF_FLOAT_VERTEX
])
{
/* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though.
* It is the job of the vertex buffer code to make sure that the vbos have the right format */
format
=
get_format_internal
(
adapter
,
WINED3DFMT_R16G16_FLOAT
);
format
->
gl_vtx_type
=
GL_FLOAT
;
format
=
get_format_internal
(
adapter
,
WINED3DFMT_R16G16B16A16_FLOAT
);
format
->
gl_vtx_type
=
GL_FLOAT
;
}
if
(
!
gl_info
->
supported
[
ARB_HALF_FLOAT_PIXEL
])
{
format
=
get_format_internal
(
adapter
,
WINED3DFMT_R16_FLOAT
);
...
...
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