Skip to contentSkip to conversation

DRI2: don't advertise GLX_INTEL_swap_event if it can't

PATCH In review Rob Clark 2 participants 2 messages Mar 12, 2013 – Mar 13, 2013

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 DRI2: don't advertise GLX_INTEL_swap_event if it can't

If ddx does not support swap, don't advertise it. We might also be able to get rid of the vmwgfx check (I'm not quite sure the purpose of that check vs. just checking dri2Minor.

---
 src/glx/dri2_glx.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
src/glx/dri2_glx.c +8 -4
index c4f6996..b2d712c 100644
@@ -1051,11 +1051,16 @@ static const struct glx_context_vtable dri2_context_vtable = {
 };
 
 static void
-dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions,
+dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
                    const char *driverName)
 {
+   const struct dri2_display *const pdp = (struct dri2_display *)
+      priv->dri2Display;
+   const __DRIextension **extensions;
    int i;
 
+   extensions = psc->core->getExtensions(psc->driScreen);
+
    __glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
    __glXEnableDirectExtension(&psc->base, "GLX_SGI_swap_control");
    __glXEnableDirectExtension(&psc->base, "GLX_MESA_swap_control");
@@ -1069,7 +1074,7 @@ dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions,
     * of disabling it uncondtionally, just disable it for drivers
     * which are known to not support it.
     */
-   if (strcmp(driverName, "vmwgfx") != 0) {
+   if (pdp->swapAvailable && strcmp(driverName, "vmwgfx") != 0) {
       __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
    }
 
@@ -1212,8 +1217,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
       goto handle_error;
    }
 
-   extensions = psc->core->getExtensions(psc->driScreen);
-   dri2BindExtensions(psc, extensions, driverName);
+   dri2BindExtensions(psc, priv, driverName);
 
    configs = driConvertConfigs(psc->core, psc->base.configs, driver_configs);
    visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs);
Signature · 1 line
1.8.1.4
#1 lore raw

Dear Rob,

Am Dienstag, den 12.03.2013, 19:44 -0400 schrieb Rob Clark:

»it« sounds strange in commit summary.

Quoted 1 line

If ddx does not support swap, don't advertise it.

So how is dri2BindExtensions changed. Some things passed beforehand are already available in struct dri2_screen *psc?

Are bugs fixed by this or did you find this reading through the code?

Quoted 2 lines

We might also be able to get rid of the vmwgfx check (I'm not quite sure the purpose of that check vs. just checking dri2Minor.

Missing »)«.

Quoted 10 lines
---
 src/glx/dri2_glx.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
src/glx/dri2_glx.c +0 -0
index c4f6996..b2d712c 100644

src/glx/dri2_glx.c static const struct glx_context_vtable dri2_context_vtable = { · line 1054

Quoted 5 lines
src/glx/dri2_glx.c +1 -1
@@ -1051,11 +1051,16 @@ static const struct glx_context_vtable dri2_context_vtable = {
 };
 
 static void
-dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions,
+dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,

No space after the * in * priv?

Quoted 22 lines
src/glx/dri2_glx.c +6 -1
                    const char *driverName)
 {
+   const struct dri2_display *const pdp = (struct dri2_display *)
+      priv->dri2Display;
+   const __DRIextension **extensions;
    int i;
 
+   extensions = psc->core->getExtensions(psc->driScreen);
+
    __glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
    __glXEnableDirectExtension(&psc->base, "GLX_SGI_swap_control");
    __glXEnableDirectExtension(&psc->base, "GLX_MESA_swap_control");
@@ -1069,7 +1074,7 @@ dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions,
     * of disabling it uncondtionally, just disable it for drivers
     * which are known to not support it.
     */
-   if (strcmp(driverName, "vmwgfx") != 0) {
+   if (pdp->swapAvailable && strcmp(driverName, "vmwgfx") != 0) {
       __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
    }
 

src/glx/dri2_glx.c dri2CreateScreen(int screen, struct glx_display * priv) · line 1223

Quoted 9 lines
src/glx/dri2_glx.c +1 -2
@@ -1212,8 +1217,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
       goto handle_error;
    }
 
-   extensions = psc->core->getExtensions(psc->driScreen);
-   dri2BindExtensions(psc, extensions, driverName);
+   dri2BindExtensions(psc, priv, driverName);
 
    configs = driConvertConfigs(psc->core, psc->base.configs, driver_configs);
    visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs);

Thanks,

Paul

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel