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
fa312a32
Commit
fa312a32
authored
Jun 13, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 13, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add format information for WINED3DFMT_R8_UNORM.
parent
d30720d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-1
utils.c
dlls/wined3d/utils.c
+7
-0
No files found.
dlls/wined3d/glsl_shader.c
View file @
fa312a32
...
@@ -6567,7 +6567,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s
...
@@ -6567,7 +6567,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s
if
(
gl_info
->
supported
[
EXT_GPU_SHADER4
]
&&
gl_info
->
supported
[
ARB_SHADER_BIT_ENCODING
]
if
(
gl_info
->
supported
[
EXT_GPU_SHADER4
]
&&
gl_info
->
supported
[
ARB_SHADER_BIT_ENCODING
]
&&
gl_info
->
supported
[
ARB_GEOMETRY_SHADER4
]
&&
gl_info
->
glsl_version
>=
MAKEDWORD_VERSION
(
1
,
50
)
&&
gl_info
->
supported
[
ARB_GEOMETRY_SHADER4
]
&&
gl_info
->
glsl_version
>=
MAKEDWORD_VERSION
(
1
,
50
)
&&
gl_info
->
supported
[
ARB_DRAW_ELEMENTS_BASE_VERTEX
]
&&
gl_info
->
supported
[
ARB_DRAW_INSTANCED
])
&&
gl_info
->
supported
[
ARB_DRAW_ELEMENTS_BASE_VERTEX
]
&&
gl_info
->
supported
[
ARB_DRAW_INSTANCED
]
&&
gl_info
->
supported
[
ARB_TEXTURE_RG
])
shader_model
=
4
;
shader_model
=
4
;
/* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3
/* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3
* texldd and texldl instructions. */
* texldd and texldl instructions. */
...
...
dlls/wined3d/utils.c
View file @
fa312a32
...
@@ -85,6 +85,7 @@ static const struct wined3d_format_channels formats[] =
...
@@ -85,6 +85,7 @@ static const struct wined3d_format_channels formats[] =
{
WINED3DFMT_B5G5R5A1_UNORM
,
5
,
5
,
5
,
1
,
10
,
5
,
0
,
15
,
2
,
0
,
0
},
{
WINED3DFMT_B5G5R5A1_UNORM
,
5
,
5
,
5
,
1
,
10
,
5
,
0
,
15
,
2
,
0
,
0
},
{
WINED3DFMT_B4G4R4A4_UNORM
,
4
,
4
,
4
,
4
,
8
,
4
,
0
,
12
,
2
,
0
,
0
},
{
WINED3DFMT_B4G4R4A4_UNORM
,
4
,
4
,
4
,
4
,
8
,
4
,
0
,
12
,
2
,
0
,
0
},
{
WINED3DFMT_B2G3R3_UNORM
,
3
,
3
,
2
,
0
,
5
,
2
,
0
,
0
,
1
,
0
,
0
},
{
WINED3DFMT_B2G3R3_UNORM
,
3
,
3
,
2
,
0
,
5
,
2
,
0
,
0
,
1
,
0
,
0
},
{
WINED3DFMT_R8_UNORM
,
8
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
1
,
0
,
0
},
{
WINED3DFMT_A8_UNORM
,
0
,
0
,
0
,
8
,
0
,
0
,
0
,
0
,
1
,
0
,
0
},
{
WINED3DFMT_A8_UNORM
,
0
,
0
,
0
,
8
,
0
,
0
,
0
,
0
,
1
,
0
,
0
},
{
WINED3DFMT_B2G3R3A8_UNORM
,
3
,
3
,
2
,
8
,
5
,
2
,
0
,
8
,
2
,
0
,
0
},
{
WINED3DFMT_B2G3R3A8_UNORM
,
3
,
3
,
2
,
8
,
5
,
2
,
0
,
8
,
2
,
0
,
0
},
{
WINED3DFMT_B4G4R4X4_UNORM
,
4
,
4
,
4
,
0
,
8
,
4
,
0
,
0
,
2
,
0
,
0
},
{
WINED3DFMT_B4G4R4X4_UNORM
,
4
,
4
,
4
,
0
,
8
,
4
,
0
,
0
,
2
,
0
,
0
},
...
@@ -782,6 +783,11 @@ static const struct wined3d_format_texture_info format_texture_info[] =
...
@@ -782,6 +783,11 @@ static const struct wined3d_format_texture_info format_texture_info[] =
GL_RGB
,
GL_UNSIGNED_BYTE_3_3_2
,
0
,
GL_RGB
,
GL_UNSIGNED_BYTE_3_3_2
,
0
,
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
,
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
,
WINED3D_GL_EXT_NONE
,
NULL
},
WINED3D_GL_EXT_NONE
,
NULL
},
{
WINED3DFMT_R8_UNORM
,
GL_R8
,
GL_R8
,
0
,
GL_RED
,
GL_UNSIGNED_BYTE
,
0
,
WINED3DFMT_FLAG_TEXTURE
|
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
|
WINED3DFMT_FLAG_RENDERTARGET
|
WINED3DFMT_FLAG_VTF
,
ARB_TEXTURE_RG
,
NULL
},
{
WINED3DFMT_A8_UNORM
,
GL_ALPHA8
,
GL_ALPHA8
,
0
,
{
WINED3DFMT_A8_UNORM
,
GL_ALPHA8
,
GL_ALPHA8
,
0
,
GL_ALPHA
,
GL_UNSIGNED_BYTE
,
0
,
GL_ALPHA
,
GL_UNSIGNED_BYTE
,
0
,
WINED3DFMT_FLAG_TEXTURE
|
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
,
WINED3DFMT_FLAG_TEXTURE
|
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
,
...
@@ -3056,6 +3062,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c
...
@@ -3056,6 +3062,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c
{
WINED3DFMT_B5G6R5_UNORM
,
31
.
0
f
,
63
.
0
f
,
31
.
0
f
,
0
.
0
f
,
11
,
5
,
0
,
0
},
{
WINED3DFMT_B5G6R5_UNORM
,
31
.
0
f
,
63
.
0
f
,
31
.
0
f
,
0
.
0
f
,
11
,
5
,
0
,
0
},
{
WINED3DFMT_B5G5R5A1_UNORM
,
31
.
0
f
,
31
.
0
f
,
31
.
0
f
,
1
.
0
f
,
10
,
5
,
0
,
15
},
{
WINED3DFMT_B5G5R5A1_UNORM
,
31
.
0
f
,
31
.
0
f
,
31
.
0
f
,
1
.
0
f
,
10
,
5
,
0
,
15
},
{
WINED3DFMT_B5G5R5X1_UNORM
,
31
.
0
f
,
31
.
0
f
,
31
.
0
f
,
1
.
0
f
,
10
,
5
,
0
,
15
},
{
WINED3DFMT_B5G5R5X1_UNORM
,
31
.
0
f
,
31
.
0
f
,
31
.
0
f
,
1
.
0
f
,
10
,
5
,
0
,
15
},
{
WINED3DFMT_R8_UNORM
,
255
.
0
f
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
0
,
0
,
0
,
0
},
{
WINED3DFMT_A8_UNORM
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
255
.
0
f
,
0
,
0
,
0
,
0
},
{
WINED3DFMT_A8_UNORM
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
255
.
0
f
,
0
,
0
,
0
,
0
},
{
WINED3DFMT_B4G4R4A4_UNORM
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
8
,
4
,
0
,
12
},
{
WINED3DFMT_B4G4R4A4_UNORM
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
8
,
4
,
0
,
12
},
{
WINED3DFMT_B4G4R4X4_UNORM
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
8
,
4
,
0
,
12
},
{
WINED3DFMT_B4G4R4X4_UNORM
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
15
.
0
f
,
8
,
4
,
0
,
12
},
...
...
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