Merge new code

1 files changed, 175 insertions, 135 deletions

diff --git a/src/glx/glitz_glx_drawable.c b/src/glx/glitz_glx_drawable.c
index f770476..7c80925 100644
--- a/src/glx/glitz_glx_drawable.c
+++ b/src/glx/glitz_glx_drawable.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2004 David Reveman
- * 
+ *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
@@ -12,11 +12,11 @@
  * software for any purpose. It is provided "as is" without express or
  * implied warranty.
  *
- * DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+ * DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
  * NO EVENT SHALL DAVID REVEMAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
@@ -31,172 +31,212 @@
 
 static glitz_glx_drawable_t *
 _glitz_glx_create_drawable (glitz_glx_screen_info_t *screen_info,
-                            glitz_glx_context_t     *context,
-                            glitz_drawable_format_t *format,
-                            GLXDrawable             glx_drawable,
-                            GLXPbuffer              glx_pbuffer,
-                            int                     width,
-                            int                     height)
+			    glitz_glx_context_t     *context,
+			    glitz_drawable_format_t *format,
+			    GLXDrawable             glx_drawable,
+			    GLXPbuffer              glx_pbuffer,
+			    int                     width,
+			    int                     height)
 {
-  glitz_glx_drawable_t *drawable;
-  
-  if (width <= 0 || height <= 0)
-    return NULL;
-
-  drawable = (glitz_glx_drawable_t *) malloc (sizeof (glitz_glx_drawable_t));
-  if (drawable == NULL)
-    return NULL;
-
-  drawable->base.ref_count = 1;
-  drawable->screen_info = screen_info;
-  drawable->context = context;
-  drawable->drawable = glx_drawable;
-  drawable->pbuffer = glx_pbuffer;
-  drawable->base.format = format;
-  drawable->base.backend = &context->backend;
-
-  glitz_drawable_update_size (&drawable->base, width, height);
-
-  if (!context->initialized) {
-    glitz_glx_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT);
-    glitz_glx_pop_current (drawable);
-  }
-  
-  if (width > context->max_viewport_dims[0] ||
-      height > context->max_viewport_dims[1]) {
-    free (drawable);
-    return NULL;
-  }
-  
-  screen_info->drawables++;
-  
-  return drawable;
+    glitz_glx_drawable_t *drawable;
+
+    drawable = (glitz_glx_drawable_t *) malloc (sizeof (glitz_glx_drawable_t));
+    if (drawable == NULL)
+	return NULL;
+
+    drawable->screen_info = screen_info;
+    drawable->context = context;
+    drawable->drawable = glx_drawable;
+    drawable->pbuffer = glx_pbuffer;
+    drawable->width = width;
+    drawable->height = height;
+
+    _glitz_drawable_init (&drawable->base,
+			  &screen_info->formats[format->id],
+			  &context->backend,
+			  width, height);
+
+    if (!context->initialized) {
+	glitz_glx_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT);
+	glitz_glx_pop_current (drawable);
+    }
+
+    if (width > context->backend.max_viewport_dims[0] ||
+	height > context->backend.max_viewport_dims[1]) {
+	free (drawable);
+	return NULL;
+    }
+
+    screen_info->drawables++;
+
+    return drawable;
+}
+
+glitz_bool_t
+_glitz_glx_drawable_update_size (glitz_glx_drawable_t *drawable,
+				 int                  width,
+				 int                  height)
+{
+    if (drawable->pbuffer)
+    {
+	glitz_glx_pbuffer_destroy (drawable->screen_info, drawable->pbuffer);
+	drawable->drawable = drawable->pbuffer =
+	    glitz_glx_pbuffer_create (drawable->screen_info,
+				      drawable->context->fbconfig,
+				      (int) width, (int) height);
+	if (!drawable->pbuffer)
+	    return 0;
+    }
+
+    drawable->width  = width;
+    drawable->height = height;
+
+    return 1;
 }
 
 static glitz_drawable_t *
 _glitz_glx_create_pbuffer_drawable (glitz_glx_screen_info_t *screen_info,
-                                    glitz_drawable_format_t *format,
-                                    unsigned int            width,
-                                    unsigned int            height)
+				    glitz_drawable_format_t *format,
+				    unsigned int            width,
+				    unsigned int            height)
 {
-  glitz_glx_drawable_t *drawable;
-  glitz_glx_context_t *context;
-  GLXPbuffer pbuffer;
-
-  if (!format->types.pbuffer)
-    return NULL;
-  
-  context = glitz_glx_context_get (screen_info, format);
-  if (!context)
-    return NULL;
-
-  pbuffer = glitz_glx_pbuffer_create (screen_info, context->fbconfig,
-                                      (int) width, (int) height);
-  if (!pbuffer)
-    return NULL;
-  
-  drawable = _glitz_glx_create_drawable (screen_info, context, format,
-                                         pbuffer, pbuffer,
-                                         width, height);
-  if (!drawable) {
-    glitz_glx_pbuffer_destroy (screen_info, pbuffer);
-    return NULL;
-  }
-  
-  return &drawable->base;
+    glitz_glx_drawable_t *drawable;
+    glitz_glx_context_t *context;
+    GLXPbuffer pbuffer;
+
+    context = glitz_glx_context_get (screen_info, format);
+    if (!context)
+	return NULL;
+
+    pbuffer = glitz_glx_pbuffer_create (screen_info, context->fbconfig,
+					(int) width, (int) height);
+    if (!pbuffer)
+	return NULL;
+
+    drawable = _glitz_glx_create_drawable (screen_info, context, format,
+					   pbuffer, pbuffer,
+					   width, height);
+    if (!drawable) {
+	glitz_glx_pbuffer_destroy (screen_info, pbuffer);
+	return NULL;
+    }
+
+    return &drawable->base;
 }
 
 glitz_drawable_t *
 glitz_glx_create_pbuffer (void                    *abstract_templ,
-                          glitz_drawable_format_t *format,
-                          unsigned int            width,
-                          unsigned int            height)
+			  glitz_drawable_format_t *format,
+			  unsigned int            width,
+			  unsigned int            height)
 {
-  glitz_glx_drawable_t *templ = (glitz_glx_drawable_t *) abstract_templ;
+    glitz_glx_drawable_t *templ = (glitz_glx_drawable_t *) abstract_templ;
 
-  return _glitz_glx_create_pbuffer_drawable (templ->screen_info, format,
-                                             width, height);
+    return _glitz_glx_create_pbuffer_drawable (templ->screen_info, format,
+					       width, height);
 }
 
 glitz_drawable_t *
 glitz_glx_create_drawable_for_window (Display                 *display,
-                                      int                     screen,
-                                      glitz_drawable_format_t *format,
-                                      Window                  window,
-                                      unsigned int            width,
-                                      unsigned int            height)
+				      int                     screen,
+				      glitz_drawable_format_t *format,
+				      Window                  window,
+				      unsigned int            width,
+				      unsigned int            height)
 {
-  glitz_glx_drawable_t *drawable;
-  glitz_glx_screen_info_t *screen_info;
-  glitz_glx_context_t *context;
-
-  screen_info = glitz_glx_screen_info_get (display, screen);
-  if (!screen_info)
-    return NULL;
-  
-  context = glitz_glx_context_get (screen_info, format);
-  if (!context)
-    return NULL;
-  
-  drawable = _glitz_glx_create_drawable (screen_info, context, format,
-                                         window, (GLXPbuffer) 0,
-                                         width, height);
-  if (!drawable)
-    return NULL;
-
-  return &drawable->base;
+    glitz_glx_drawable_t        *drawable;
+    glitz_glx_screen_info_t     *screen_info;
+    glitz_glx_context_t         *context;
+    glitz_int_drawable_format_t *iformat;
+
+    screen_info = glitz_glx_screen_info_get (display, screen);
+    if (!screen_info)
+	return NULL;
+
+    if (format->id >= screen_info->n_formats)
+	return NULL;
+
+    iformat = &screen_info->formats[format->id];
+    if (!(iformat->types & GLITZ_DRAWABLE_TYPE_WINDOW_MASK))
+	return NULL;
+
+    context = glitz_glx_context_get (screen_info, format);
+    if (!context)
+	return NULL;
+
+    drawable = _glitz_glx_create_drawable (screen_info, context, format,
+					   window, (GLXPbuffer) 0,
+					   width, height);
+    if (!drawable)
+	return NULL;
+
+    return &drawable->base;
 }
 slim_hidden_def(glitz_glx_create_drawable_for_window);
 
 glitz_drawable_t *
 glitz_glx_create_pbuffer_drawable (Display                 *display,
-                                   int                     screen,
-                                   glitz_drawable_format_t *format,
-                                   unsigned int            width,
-                                   unsigned int            height)
+				   int                     screen,
+				   glitz_drawable_format_t *format,
+				   unsigned int            width,
+				   unsigned int            height)
 {
-  glitz_glx_screen_info_t *screen_info;
+    glitz_glx_screen_info_t     *screen_info;
+    glitz_int_drawable_format_t *iformat;
+
+    screen_info = glitz_glx_screen_info_get (display, screen);
+    if (!screen_info)
+	return NULL;
+
+    if (format->id >= screen_info->n_formats)
+	return NULL;
 
-  screen_info = glitz_glx_screen_info_get (display, screen);
-  if (!screen_info)
-    return NULL;
+    iformat = &screen_info->formats[format->id];
+    if (!(iformat->types & GLITZ_DRAWABLE_TYPE_PBUFFER_MASK))
+	return NULL;
 
-  return _glitz_glx_create_pbuffer_drawable (screen_info, format,
-                                             width, height);
+    return _glitz_glx_create_pbuffer_drawable (screen_info, format,
+					       width, height);
 }
 slim_hidden_def(glitz_glx_create_pbuffer_drawable);
 
 void
 glitz_glx_destroy (void *abstract_drawable)
 {
-  glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *) abstract_drawable;
-
-  drawable->screen_info->drawables--;
-  if (drawable->screen_info->drawables == 0) {
-    /*
-     * Last drawable? We have to destroy all fragment programs as this may
-     * be our last chance to have a context current.
-     */
-    glitz_glx_push_current (abstract_drawable, NULL, GLITZ_CONTEXT_CURRENT);
-    glitz_program_map_fini (&drawable->base.backend->gl,
-                            &drawable->screen_info->program_map);
-    glitz_glx_pop_current (abstract_drawable);
-  }
-
-  if (glXGetCurrentDrawable () == drawable->drawable)
-    glXMakeCurrent (drawable->screen_info->display_info->display, None, NULL);
-  
-  if (drawable->pbuffer)
-    glitz_glx_pbuffer_destroy (drawable->screen_info, drawable->pbuffer);
-  
-  free (drawable);
+    glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *)
+	abstract_drawable;
+
+    drawable->screen_info->drawables--;
+    if (drawable->screen_info->drawables == 0) {
+	/*
+	 * Last drawable? We have to destroy all fragment programs as this may
+	 * be our last chance to have a context current.
+	 */
+	glitz_glx_push_current (abstract_drawable, NULL,
+				GLITZ_CONTEXT_CURRENT);
+	glitz_program_map_fini (drawable->base.backend->gl,
+				&drawable->screen_info->program_map);
+	glitz_glx_pop_current (abstract_drawable);
+    }
+
+    if (glXGetCurrentDrawable () == drawable->drawable)
+	glXMakeCurrent (drawable->screen_info->display_info->display,
+			None, NULL);
+
+    if (drawable->pbuffer)
+	glitz_glx_pbuffer_destroy (drawable->screen_info, drawable->pbuffer);
+
+    free (drawable);
 }
 
-void
+glitz_bool_t
 glitz_glx_swap_buffers (void *abstract_drawable)
 {
-  glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *) abstract_drawable;
+    glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *)
+	abstract_drawable;
+
+    glXSwapBuffers (drawable->screen_info->display_info->display,
+		    drawable->drawable);
 
-  glXSwapBuffers (drawable->screen_info->display_info->display,
-                  drawable->drawable);
+    return 1;
 }