From 526901e307fddc5994e3a3aa22f8a92946f50a37 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sun, 22 Jul 2012 14:59:52 +0200 Subject: [PATCH] wined3d: Get rid of APPLE_flush_render, it doesn't exist. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2a6b83bd0f9..6b6096641f2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -91,7 +91,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, - {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, /* ARB */ @@ -1413,7 +1412,6 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * DirectDraw, not OpenGL. */ if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_CLIENT_STORAGE] - && gl_info->supported[APPLE_FLUSH_RENDER] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5bc3c63469c..f01cdb393b6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1720,7 +1720,6 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, - APPLE_FLUSH_RENDER, APPLE_YCBCR_422, /* ARB */ ARB_COLOR_BUFFER_FLOAT, @@ -1887,10 +1886,6 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -/* GL_APPLE_flush_render */ -typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); -typedef void (WINE_GLAPI *PGLFNFINISHRENDERAPPLEPROC)(void); - /* GL_APPLE_ycbcr_422 */ #ifndef GL_APPLE_ycbcr_422 #define GL_APPLE_ycbcr_422 1 @@ -3712,11 +3707,6 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, \ glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ - /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, \ - glFlushRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, \ - glFinishRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(PGLFNCLAMPCOLORARBPROC, \ glClampColorARB, ARB_COLOR_BUFFER_FLOAT, NULL) \