summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-06-16 15:44:49 -0400
committerAdam Jackson <ajax@redhat.com>2017-06-20 16:39:23 -0400
commit0b1831d043028f7dd6accca19a81e2abd9a145b5 (patch)
treeecb3271c8e944a9f67de77d363b52f496221982a /hw
parentc33541e59e338cd53f89d94a6898555d350e84aa (diff)
glx: Remove some indirection around EXT_texture_from_pixmap
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/xwin/glx/indirect.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 239327ed4..ad79d249d 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -1522,11 +1522,6 @@ glxWinCreateContext(__GLXscreen * screen,
__GLXWinContext *context;
__GLXWinContext *shareContext = (__GLXWinContext *) baseShareContext;
- static __GLXtextureFromPixmap glxWinTextureFromPixmap = {
- glxWinBindTexImage,
- glxWinReleaseTexImage
- };
-
context = calloc(1, sizeof(__GLXWinContext));
if (!context)
@@ -1537,7 +1532,8 @@ glxWinCreateContext(__GLXscreen * screen,
context->base.makeCurrent = glxWinContextMakeCurrent;
context->base.loseCurrent = glxWinContextLoseCurrent;
context->base.copy = glxWinContextCopy;
- context->base.textureFromPixmap = &glxWinTextureFromPixmap;
+ context->base.bindTexImage = glxWinBindTexImage;
+ context->base.releaseTexImage = glxWinReleaseTexImage;
context->base.config = modes;
context->base.pGlxScreen = screen;