Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_asm.c
	src/gallium/tests/unit/SConscript

2 files changed, 6 insertions, 16 deletions

diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c
index 8bc54d7fc7d..048cfe819f0 100644
--- a/src/gallium/state_trackers/vdpau/decode.c
+++ b/src/gallium/state_trackers/vdpau/decode.c
@@ -134,24 +134,15 @@ vlVdpCreateSurfaceTarget(vlVdpDecoder *vldecoder, vlVdpSurface *vlsurf)
 
    vctx = vldecoder->vctx->vpipe;
 
+   if (!vctx->is_format_supported(vctx, tmplt.format, PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET))
+      return VDP_STATUS_RESOURCES;
+
    memset(&tmplt, 0, sizeof(struct pipe_resource));
    tmplt.target = PIPE_TEXTURE_2D;
    tmplt.format = vctx->get_param(vctx,PIPE_CAP_DECODE_TARGET_PREFERRED_FORMAT);
    tmplt.last_level = 0;
-
-   if (vctx->is_format_supported(vctx, tmplt.format,
-                                 PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET,
-                                 PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO)) {
-      tmplt.width0 = vlsurf->width;
-      tmplt.height0 = vlsurf->height;
-   } else {
-      assert(vctx->is_format_supported(vctx, tmplt.format,
-                                       PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET,
-                                       PIPE_TEXTURE_GEOM_NON_SQUARE));
-      tmplt.width0 = util_next_power_of_two(vlsurf->width);
-      tmplt.height0 = util_next_power_of_two(vlsurf->height);
-   }
-
+   tmplt.width0 = vlsurf->width;
+   tmplt.height0 = vlsurf->height;
    tmplt.depth0 = 1;
    tmplt.usage = PIPE_USAGE_DEFAULT;
    tmplt.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
index 74a3bd925cf..e971b6dc02e 100644
--- a/src/gallium/state_trackers/vdpau/query.c
+++ b/src/gallium/state_trackers/vdpau/query.c
@@ -123,8 +123,7 @@ vlVdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpDevice device, VdpChromaTyp
                                                              FormatToPipe(bits_ycbcr_format),
                                                              PIPE_TEXTURE_2D,
                                                              1,
-                                                             PIPE_BIND_RENDER_TARGET,
-                                                             PIPE_TEXTURE_GEOM_NON_SQUARE);
+                                                             PIPE_BIND_RENDER_TARGET);
 
    vl_screen_destroy(vlscreen);