Matteo Bruni : wined3d: Don't run check_filter() on core contexts.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jul 28 13:30:07 CDT 2015


Module: wine
Branch: master
Commit: 12ef1756d2550c29873b8aec1a7dfaf1d3f0bbae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=12ef1756d2550c29873b8aec1a7dfaf1d3f0bbae

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Mon Jul 27 14:29:54 2015 +0200

wined3d: Don't run check_filter() on core contexts.

The code uses glBegin() / glEnd() and other APIs removed from core
profile.

---

 dlls/wined3d/utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 6c871f1..e57db99 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -2375,7 +2375,8 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3
         /* This was already handled by init_format_texture_info(). */
         return;
 
-    if(wined3d_settings.offscreen_rendering_mode != ORM_FBO)
+    if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
+            || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
     {
         WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n");
         if (vendor == HW_VENDOR_NVIDIA && gl_info->supported[ARB_TEXTURE_FLOAT])




More information about the wine-cvs mailing list