diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-03-18 17:03:09 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-03-28 12:46:38 -0400 |
| commit | c327d07cc68802256c679a65d78f98f17327abda (patch) | |
| tree | 1160cf1ff8d1cb7291119db54ffb34bbbfc1ec5d /glx/glxdri2.c | |
| parent | a48dadc98a28c969741979b70b7a639f24f4cbbd (diff) | |
glx: Remove ->forceCurrent from the context vtable
All the implementations of makeCurrent and forceCurrent are identical,
so just use makeCurrent everywhere.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glx/glxdri2.c')
| -rw-r--r-- | glx/glxdri2.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 18927d75d..e8961e255 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -283,19 +283,6 @@ __glXDRIcontextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, src->driContext, mask); } -static int -__glXDRIcontextForceCurrent(__GLXcontext *baseContext) -{ - __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext; - __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv; - __GLXDRIdrawable *read = (__GLXDRIdrawable *) baseContext->readPriv; - __GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen; - - return (*screen->core->bindContext)(context->driContext, - draw->driDrawable, - read->driDrawable); -} - static Bool __glXDRIcontextWait(__GLXcontext *baseContext, __GLXclientState *cl, int *error) @@ -411,7 +398,6 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, context->base.makeCurrent = __glXDRIcontextMakeCurrent; context->base.loseCurrent = __glXDRIcontextLoseCurrent; context->base.copy = __glXDRIcontextCopy; - context->base.forceCurrent = __glXDRIcontextForceCurrent; context->base.textureFromPixmap = &__glXDRItextureFromPixmap; context->base.wait = __glXDRIcontextWait; |