Merge remote branch 'origin/master' into lp-binning

[mesa.git] / src / gallium / auxiliary / util / u_surface.c

diff --git a/src/gallium/auxiliary/util/u_surface.c b/src/gallium/auxiliary/util/u_surface.c
index cfdf7ab8f8a9fb6ea3213d460bac93fa87ee04bd..f66376ad7509ff04eda038d0db9e865a0feea22b 100644 (file)
--- a/src/gallium/auxiliary/util/u_surface.c
+++ b/src/gallium/auxiliary/util/u_surface.c
@@ -37,6 +37,7 @@
 #include "pipe/p_defines.h"
 
 #include "util/u_memory.h"
+#include "util/u_format.h"
 #include "util/u_surface.h"
 
 
@@ -80,10 +81,9 @@ util_create_rgba_surface(struct pipe_screen *screen,
    templ.target = target;
    templ.format = format;
    templ.last_level = 0;
-   templ.width[0] = width;
-   templ.height[0] = height;
-   templ.depth[0] = 1;
-   pf_get_block(format, &templ.block);
+   templ.width0 = width;
+   templ.height0 = height;
+   templ.depth0 = 1;
    templ.tex_usage = usage;
 
    *textureOut = screen->texture_create(screen, &templ);