5 files changed, 9 insertions, 6 deletions
diff --git a/src/glx/compsize.c b/src/glx/compsize.c
index ccb3a0e924..f69ffaba31 100644
--- a/src/glx/compsize.c
+++ b/src/glx/compsize.c
@@ -66,6 +66,7 @@ __glElementsPerGroup(GLenum format, GLenum type)
    case GL_RGB:
    case GL_BGR:
       return 3;
+   case GL_RG:
    case GL_422_EXT:
    case GL_422_REV_EXT:
    case GL_422_AVERAGE_EXT:
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 5fb5255416..83d6e3c310 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -391,17 +391,19 @@ driReleaseDrawables(struct glx_context *gc)
 
    if (__glxHashLookup(priv->drawHash,
 		       gc->currentDrawable, (void *) &pdraw) == 0) {
-      if (pdraw->drawable == pdraw->xDrawable)
+      if (pdraw->drawable == pdraw->xDrawable) {
 	 (*pdraw->destroyDrawable)(pdraw);
-      __glxHashDelete(priv->drawHash, gc->currentDrawable);
+	 __glxHashDelete(priv->drawHash, gc->currentDrawable);
+      }
    }
 
    if (gc->currentDrawable != gc->currentReadable &&
        __glxHashLookup(priv->drawHash,
 		       gc->currentReadable, (void *) &pdraw) == 0) {
-      if (pdraw->drawable == pdraw->xDrawable)
+      if (pdraw->drawable == pdraw->xDrawable) {
 	 (*pdraw->destroyDrawable)(pdraw);
-      __glxHashDelete(priv->drawHash, gc->currentReadable);
+	 __glxHashDelete(priv->drawHash, gc->currentReadable);
+      }
    }
 }
 
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 324b5a65c1..36a0808c04 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -89,8 +89,6 @@ typedef struct __GLXDRIdisplayRec __GLXDRIdisplay;
 typedef struct __GLXDRIscreenRec __GLXDRIscreen;
 typedef struct __GLXDRIdrawableRec __GLXDRIdrawable;
 
-#include "glxextensions.h"
-
 struct __GLXDRIdisplayRec
 {
     /**
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index 23161ef49a..3a0e64c46d 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -165,6 +165,7 @@ static const struct extension_info known_gl_extensions[] = {
    { GL(ARB_texture_mirrored_repeat),    VER(1,4), Y, N, N, N },
    { GL(ARB_texture_non_power_of_two),   VER(1,5), Y, N, N, N },
    { GL(ARB_texture_rectangle),          VER(0,0), Y, N, N, N },
+   { GL(ARB_texture_rg),                 VER(0,0), Y, N, N, N },
    { GL(ARB_transpose_matrix),           VER(1,3), Y, N, Y, N },
    { GL(ARB_vertex_buffer_object),       VER(1,5), N, N, N, N },
    { GL(ARB_vertex_program),             VER(0,0), Y, N, N, N },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index a11fe88ffc..7877661833 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -93,6 +93,7 @@ enum
    GL_ARB_texture_mirrored_repeat_bit,
    GL_ARB_texture_non_power_of_two_bit,
    GL_ARB_texture_rectangle_bit,
+   GL_ARB_texture_rg_bit,
    GL_ARB_transpose_matrix_bit,
    GL_ARB_vertex_buffer_object_bit,
    GL_ARB_vertex_program_bit,