X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ffreedreno%2Fa2xx%2Ffd2_draw.c;h=938c0ba9d34c500586358e192be64ed76bf59532;hb=2dc4d6c6921ce21ff379696f151fb18434800fee;hp=ecc0798679df6df62bbc92cd62fd3066711cba8b;hpb=c34b285b38400ca1aaa7d00410bc99d393c79e2f;p=mesa.git

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c
index ecc0798679d..938c0ba9d34 100644
--- a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c
@@ -154,7 +154,7 @@ static bool
 fd2_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *pinfo,
 			 unsigned index_offset)
 {
-	if (!ctx->prog.fp || !ctx->prog.vp)
+	if (!ctx->prog.fs || !ctx->prog.vs)
 		return false;
 
 	if (ctx->dirty & FD_DIRTY_VTXBUF)
@@ -428,17 +428,21 @@ fd2_clear_fast(struct fd_context *ctx, unsigned buffers,
 	if (buffers & PIPE_CLEAR_COLOR)
 		color_size = util_format_get_blocksizebits(format) == 32;
 
-	if (buffers & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL))
+	if (buffers & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL)) {
+		/* no fast clear when clearing only one component of depth+stencil buffer */
+		if (!(buffers & PIPE_CLEAR_DEPTH))
+			return false;
+
+		if ((pfb->zsbuf->format == PIPE_FORMAT_Z24_UNORM_S8_UINT ||
+			 pfb->zsbuf->format == PIPE_FORMAT_S8_UINT_Z24_UNORM) &&
+			 !(buffers & PIPE_CLEAR_STENCIL))
+			return false;
+
 		depth_size = fd_pipe2depth(pfb->zsbuf->format) == DEPTHX_24_8;
+	}
 
 	assert(color_size >= 0 || depth_size >= 0);
 
-	/* when clearing 24_8, depth/stencil must be both cleared
-	 * TODO: if buffer isn't attached we can clear it anyway
-	 */
-	if (depth_size == 1 && !(buffers & PIPE_CLEAR_STENCIL) != !(buffers & PIPE_CLEAR_DEPTH))
-		return false;
-
 	if (color_size == 0) {
 		color_clear = pack_rgba(format, color->f);
 		color_clear = (color_clear << 16) | (color_clear & 0xffff);