Skip to content

W
wine-winehq
Commit 695f316c authored by Raphael Junqueira's avatar Raphael Junqueira Committed by Alexandre Julliard
Browse files
Options

- implements WGL_ARB_render_texture support (no more stubs)

- pass glXGetProcAddressARB ptr to initialise function
parent fc1f63d2
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 18 deletions
dlls/opengl32/wgl.c
View file @ 695f316c
......@@ -54,7 +54,7 @@ static Display *default_display; /* display to use for default context */
static HMODULE opengl32_handle;
static void *(*p_glXGetProcAddressARB)(const GLubyte *);
static glXGetProcAddressARB_t p_glXGetProcAddressARB = NULL;
typedef struct wine_glcontext {
HDC hdc;
......@@ -761,7 +761,7 @@ static BOOL process_attach(void)
}
/* Initialize also the list of supported WGL extensions. */
wgl_ext_initialize_extensions(default_display, DefaultScreen(default_display));
wgl_ext_initialize_extensions(default_display, DefaultScreen(default_display), p_glXGetProcAddressARB);
if (default_cx == NULL) {
ERR("Could not create default context.\n");
......
dlls/opengl32/wgl_ext.c
View file @ 695f316c
......@@ -85,15 +85,19 @@ inline static void set_drawable( HDC hdc, Drawable drawable )
static const char *WGL_extensions_base = "WGL_ARB_extensions_string WGL_EXT_extensions_string";
static char *WGL_extensions = NULL;
/* Extensions-query functions */
BOOL query_function_multisample(const char *gl_version, const char *gl_extensions,
/**
* Extensions-query functions
*
* @TODO: use a struct to handle parameters
*/
BOOL query_function_multisample(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions,
const char* glx_version, const char *glx_extensions,
const char *server_glx_extensions, const char *client_glx_extensions)
{
return NULL != strstr("GLX_ARB_multisample", glx_extensions);
}
BOOL query_function_pbuffer(const char *gl_version, const char *gl_extensions,
BOOL query_function_pbuffer(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions,
const char* glx_version, const char *glx_extensions,
const char *server_glx_extensions, const char *client_glx_extensions)
{
......@@ -103,18 +107,30 @@ BOOL query_function_pbuffer(const char *gl_version, const char *gl_extensions,
return 0 <= strcmp("1.3", glx_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer");
}
BOOL query_function_pixel_format(const char *gl_version, const char *gl_extensions,
BOOL query_function_pixel_format(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions,
const char* glx_version, const char *glx_extensions,
const char *server_glx_extensions, const char *client_glx_extensions)
{
return TRUE;
}
BOOL query_function_render_texture(const char *gl_version, const char *gl_extensions,
/** GLX_ARB_render_texture */
Bool (*p_glXBindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
Bool (*p_glXReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
Bool (*p_glXDrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList);
BOOL query_function_render_texture(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions,
const char* glx_version, const char *glx_extensions,
const char *server_glx_extensions, const char *client_glx_extensions)
{
return 0 <= strcmp("1.3", glx_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer");
BOOL bTest = (0 <= strcmp("1.3", glx_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer") || NULL != strstr(glx_extensions, "GLX_ARB_render_texture"));
if (bTest) {
p_glXBindTexImageARB = proc("glXBindTexImageARB");
p_glXReleaseTexImageARB = proc("glXReleaseTexImageARB");
p_glXDrawableAttribARB = proc("glXDrawableAttribARB");
bTest = (NULL != p_glXBindTexImageARB && NULL != p_glXReleaseTexImageARB && NULL != p_glXDrawableAttribARB);
}
return bTest;
}
/***********************************************************************
......@@ -385,31 +401,33 @@ GLboolean WINAPI wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAttribute, int *p
break;
}
return GL_TRUE;
}
GLboolean WINAPI wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer)
{
Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer;
TRACE("(%p, %d)\n", hPbuffer, iBuffer);
return GL_TRUE;
return p_glXBindTexImageARB(object->display, object->drawable, iBuffer);
}
GLboolean WINAPI wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer)
{
Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer;
TRACE("(%p, %d)\n", hPbuffer, iBuffer);
return GL_TRUE;
return p_glXReleaseTexImageARB(object->display, object->drawable, iBuffer);
}
GLboolean WINAPI wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList)
{
TRACE("(%p, %p)\n", hPbuffer, piAttribList);
return GL_TRUE;
Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer;
WARN("(%p, %p): alpha-testing, report any problem\n", hPbuffer, piAttribList);
return p_glXDrawableAttribARB(object->display, object->drawable, piAttribList);
}
static const struct {
const char *name;
BOOL (*query_function)(const char *gl_version, const char *gl_extensions,
BOOL (*query_function)(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions,
const char *glx_version, const char *glx_extensions,
const char *server_glx_extensions, const char *client_glx_extensions);
} extension_list[] = {
......@@ -420,7 +438,7 @@ static const struct {
};
/* Used to initialize the WGL extension string at DLL loading */
void wgl_ext_initialize_extensions(Display *display, int screen)
void wgl_ext_initialize_extensions(Display *display, int screen, glXGetProcAddressARB_t proc)
{
int size = strlen(WGL_extensions_base);
const char *glx_extensions = glXQueryExtensionsString(display, screen);
......@@ -438,7 +456,7 @@ void wgl_ext_initialize_extensions(Display *display, int screen)
TRACE("Client GLX exts : %s.\n", debugstr_a(client_glx_extensions));
for (i = 0; i < (sizeof(extension_list) / sizeof(extension_list[0])); i++) {
if (extension_list[i].query_function(gl_version, gl_extensions,
if (extension_list[i].query_function(proc, gl_version, gl_extensions,
glx_version, glx_extensions,
server_glx_extensions, client_glx_extensions)) {
size += strlen(extension_list[i].name) + 1;
......@@ -452,7 +470,7 @@ void wgl_ext_initialize_extensions(Display *display, int screen)
} else {
strcpy(WGL_extensions, WGL_extensions_base);
for (i = 0; i < (sizeof(extension_list) / sizeof(extension_list[0])); i++) {
if (extension_list[i].query_function(gl_version, gl_extensions,
if (extension_list[i].query_function(proc, gl_version, gl_extensions,
glx_version, glx_extensions,
server_glx_extensions, client_glx_extensions)) {
strcat(WGL_extensions, " ");
......
dlls/opengl32/wgl_ext.h
View file @ 695f316c
......@@ -22,8 +22,10 @@
#include "opengl_ext.h"
typedef void* (*glXGetProcAddressARB_t)(const GLubyte *);
/* Used to initialize the WGL extension string at DLL loading */
void wgl_ext_initialize_extensions(Display *display, int screen);
void wgl_ext_initialize_extensions(Display *display, int screen, glXGetProcAddressARB_t proc);
void wgl_ext_finalize_extensions(void);
typedef struct {
......
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