Mesa (staging/19.1): anv: fix use of comma operator

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 24 10:49:02 UTC 2019


Module: Mesa
Branch: staging/19.1
Commit: dccd75b60c201f985d980fc8db5b2ac0c788c5b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dccd75b60c201f985d980fc8db5b2ac0c788c5b7

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Jul 23 14:12:43 2019 +0300

anv: fix use of comma operator

This doesn't fix any bug at the moment because the next statement is
'true' which happens to be APIMODE_D3D, but if that changes it could.

The fixes tags is as far I could go but the error predates it (2016 is
probably far enough).

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 8db6f2e6ebb9 ("anv/pipeline: Roll genX_pipeline_util.h into genX_pipeline.c")
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit 772a5f981485d81919f1cb8ab52ddff0412c6ee5)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

Conflicts:
	src/intel/vulkan/genX_pipeline.c

---

 src/intel/vulkan/genX_pipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 0b58dce05b0..8db2e1e6aa0 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1075,7 +1075,7 @@ emit_3dstate_clip(struct anv_pipeline *pipeline,
       clip.ClipEnable               = true;
       clip.StatisticsEnable         = true;
       clip.EarlyCullEnable          = true;
-      clip.APIMode                  = APIMODE_D3D,
+      clip.APIMode                  = APIMODE_D3D;
       clip.ViewportXYClipTestEnable = true;
 
 #if GEN_GEN >= 8




More information about the mesa-commit mailing list