From 7ed9dbafdbc724c1030404f29678559134de559b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 1 Oct 2012 09:36:37 +0200
Subject: libxcb mesa pixman xkeyboard-config git update 1 oct 2012

libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef
mesa: c321b1bef15e2807de3f6225c4abcbf48969997a
pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d
xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
---
 mesalib/src/gallium/auxiliary/util/u_surface.c | 30 +++-----------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'mesalib/src/gallium/auxiliary/util/u_surface.c')

diff --git a/mesalib/src/gallium/auxiliary/util/u_surface.c b/mesalib/src/gallium/auxiliary/util/u_surface.c
index fcfff148f..7fd6b3675 100644
--- a/mesalib/src/gallium/auxiliary/util/u_surface.c
+++ b/mesalib/src/gallium/auxiliary/util/u_surface.c
@@ -66,11 +66,9 @@ u_surface_default_template(struct pipe_surface *surf,
  * \return TRUE for success, FALSE if failure
  */
 boolean
-util_create_rgba_surface(struct pipe_context *pipe,
-                         uint width, uint height,
-                         uint bind,
-                         struct pipe_resource **textureOut,
-                         struct pipe_surface **surfaceOut)
+util_create_rgba_texture(struct pipe_context *pipe,
+                         uint width, uint height, uint bind,
+                         struct pipe_resource **textureOut)
 {
    static const enum pipe_format rgbaFormats[] = {
       PIPE_FORMAT_B8G8R8A8_UNORM,
@@ -113,32 +111,10 @@ util_create_rgba_surface(struct pipe_context *pipe,
 
    /* create surface */
    u_surface_default_template(&surf_templ, *textureOut, bind);
-   /* create surface / view into texture */
-   *surfaceOut = pipe->create_surface(pipe,
-                                      *textureOut,
-                                      &surf_templ);
-   if (!*surfaceOut) {
-      pipe_resource_reference(textureOut, NULL);
-      return FALSE;
-   }
-
    return TRUE;
 }
 
 
-/**
- * Release the surface and texture from util_create_rgba_surface().
- */
-void
-util_destroy_rgba_surface(struct pipe_resource *texture,
-                          struct pipe_surface *surface)
-{
-   pipe_surface_reference(&surface, NULL);
-   pipe_resource_reference(&texture, NULL);
-}
-
-
-
 /**
  * Fallback function for pipe->resource_copy_region().
  * Note: (X,Y)=(0,0) is always the upper-left corner.
-- 
cgit v1.2.3