summaryrefslogtreecommitdiff
path: root/glx/glxdri2.c
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 /glx/glxdri2.c
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 'glx/glxdri2.c')
-rw-r--r--glx/glxdri2.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 484b4aeab..eae3748a9 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -335,11 +335,6 @@ __glXDRIreleaseTexImage(__GLXcontext * baseContext,
return Success;
}
-static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
- __glXDRIbindTexImage,
- __glXDRIreleaseTexImage
-};
-
static Bool
dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
const uint32_t *attribs,
@@ -561,7 +556,8 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen,
context->base.makeCurrent = __glXDRIcontextMakeCurrent;
context->base.loseCurrent = __glXDRIcontextLoseCurrent;
context->base.copy = __glXDRIcontextCopy;
- context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
+ context->base.bindTexImage = __glXDRIbindTexImage;
+ context->base.releaseTexImage = __glXDRIreleaseTexImage;
context->base.wait = __glXDRIcontextWait;
create_driver_context(context, screen, config, driShare, num_attribs,