summaryrefslogtreecommitdiff
path: root/src/glx/dri_common.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-07-19 14:57:59 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-07-19 22:45:50 -0400
commitf972115d33e391499e049b83a1559959f2ca9f72 (patch)
treefeb78c590d5a92db5d0b2b00a9c52f2d414eb9c9 /src/glx/dri_common.c
parenta296d96de45d38a6ed0b3c817334d443facc169b (diff)
glx: Add screen privates for dri drivers and moved some fields there
GLXscreenConfigs is badly named and a dumping ground for a lot of stuff. This patch creates private screen structs for the dri drivers and moves some of their fields over there.
Diffstat (limited to 'src/glx/dri_common.c')
-rw-r--r--src/glx/dri_common.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 429fc6d891..19936ff57a 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -338,13 +338,10 @@ driConvertConfigs(const __DRIcoreExtension * core,
/* Bind DRI1 specific extensions */
_X_HIDDEN void
-driBindExtensions(__GLXscreenConfigs *psc)
+driBindExtensions(__GLXscreenConfigs *psc, const __DRIextension **extensions)
{
- const __DRIextension **extensions;
int i;
- extensions = psc->core->getExtensions(psc->__driScreen);
-
for (i = 0; extensions[i]; i++) {
#ifdef __DRI_SWAP_CONTROL
/* No DRI2 support for swap_control at the moment, since SwapBuffers
@@ -375,13 +372,11 @@ driBindExtensions(__GLXscreenConfigs *psc)
/* Bind DRI2 specific extensions */
_X_HIDDEN void
-dri2BindExtensions(__GLXscreenConfigs *psc)
+dri2BindExtensions(__GLXscreenConfigs *psc,
+ const __DRIextension **extensions)
{
- const __DRIextension **extensions;
int i;
- extensions = psc->core->getExtensions(psc->__driScreen);
-
for (i = 0; extensions[i]; i++) {
#ifdef __DRI_TEX_BUFFER
if ((strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0)) {
@@ -413,13 +408,11 @@ dri2BindExtensions(__GLXscreenConfigs *psc)
/* Bind extensions common to DRI1 and DRI2 */
_X_HIDDEN void
-driBindCommonExtensions(__GLXscreenConfigs *psc)
+driBindCommonExtensions(__GLXscreenConfigs *psc,
+ const __DRIextension **extensions)
{
- const __DRIextension **extensions;
int i;
- extensions = psc->core->getExtensions(psc->__driScreen);
-
for (i = 0; extensions[i]; i++) {
#ifdef __DRI_COPY_SUB_BUFFER
if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {