Henri Verbeet : wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program.
Alexandre Julliard
julliard at winehq.org
Mon Mar 12 11:59:55 CDT 2012
Module: wine
Branch: master
Commit: 6396ad9e4517bbae146d774137207e7d91f2b25c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6396ad9e4517bbae146d774137207e7d91f2b25c
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun Mar 11 22:03:11 2012 +0100
wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program.
---
dlls/wined3d/directx.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 56c4066..5c46d07 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2542,20 +2542,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max);
gl_info->limits.textures = min(MAX_TEXTURES, gl_max);
TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures);
- glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max);
- gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max);
- TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords);
if (gl_info->supported[ARB_FRAGMENT_PROGRAM])
{
GLint tmp;
+ glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max);
+ gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max);
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp);
gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp);
}
else
{
+ gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max);
gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max);
}
+ TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords);
TRACE_(d3d_caps)("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers);
if (gl_info->supported[ARB_VERTEX_SHADER])
More information about the wine-cvs
mailing list