Skip to content

W
wine-winehq
Commit cf2b981c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

wined3d: Make use of the generated wgl.h header.

parent e5b18af9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/wined3d/utils.c
View file @ cf2b981c
...@@ -573,7 +573,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ...@@ -573,7 +573,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
WINED3DFMT_FLAG_FILTERING, WINED3DFMT_FLAG_FILTERING,
WINED3D_GL_EXT_NONE, NULL}, WINED3D_GL_EXT_NONE, NULL},
{WINED3DFMT_UYVY, GL_RGB, GL_RGB, 0, {WINED3DFMT_UYVY, GL_RGB, GL_RGB, 0,
GL_YCBCR_422_APPLE, UNSIGNED_SHORT_8_8_APPLE, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0,
WINED3DFMT_FLAG_FILTERING, WINED3DFMT_FLAG_FILTERING,
APPLE_YCBCR_422, NULL}, APPLE_YCBCR_422, NULL},
{WINED3DFMT_YUY2, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0, {WINED3DFMT_YUY2, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0,
...@@ -581,7 +581,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ...@@ -581,7 +581,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
WINED3DFMT_FLAG_FILTERING, WINED3DFMT_FLAG_FILTERING,
WINED3D_GL_EXT_NONE, NULL}, WINED3D_GL_EXT_NONE, NULL},
{WINED3DFMT_YUY2, GL_RGB, GL_RGB, 0, {WINED3DFMT_YUY2, GL_RGB, GL_RGB, 0,
GL_YCBCR_422_APPLE, UNSIGNED_SHORT_8_8_REV_APPLE, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0,
WINED3DFMT_FLAG_FILTERING, WINED3DFMT_FLAG_FILTERING,
APPLE_YCBCR_422, NULL}, APPLE_YCBCR_422, NULL},
{WINED3DFMT_YV12, GL_ALPHA, GL_ALPHA, 0, {WINED3DFMT_YV12, GL_ALPHA, GL_ALPHA, 0,
...@@ -864,7 +864,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ...@@ -864,7 +864,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0,
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED,
ATI_TEXTURE_COMPRESSION_3DC, NULL}, ATI_TEXTURE_COMPRESSION_3DC, NULL},
{WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2, GL_COMPRESSED_RED_GREEN_RGTC2, 0, {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, 0,
GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0,
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED,
ARB_TEXTURE_COMPRESSION_RGTC, NULL}, ARB_TEXTURE_COMPRESSION_RGTC, NULL},
......
dlls/wined3d/wined3d_gl.h
View file @ cf2b981c
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment