From c31964727676853d7da10f48e02b93fd2f89c40b Mon Sep 17 00:00:00 2001 From: xazhang Date: Wed, 4 Oct 2023 10:27:35 -0400 Subject: [PATCH] fix merge error --- lgc/include/lgc/state/ResourceUsage.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lgc/include/lgc/state/ResourceUsage.h b/lgc/include/lgc/state/ResourceUsage.h index d04d190678..e065f4a32e 100644 --- a/lgc/include/lgc/state/ResourceUsage.h +++ b/lgc/include/lgc/state/ResourceUsage.h @@ -249,15 +249,15 @@ struct ResourceUsage { // Geometry shader struct { // Input - unsigned pointSizeIn : 1; // Whether gl_in[].gl_PointSize is used - unsigned positionIn : 1; // Whether gl_in[].gl_Position is used - unsigned clipDistanceIn : 4; // Array size of gl_in[].gl_ClipDistance[] (0 means unused) - unsigned cullDistanceIn : 4; // Array size of gl_in[].gl_CullDistance[] (0 means unused) - unsigned primitiveIdIn : 1; // Whether gl_PrimitiveIDIn is used - unsigned invocationId : 1; // Whether gl_InvocationID is used - unsigned viewIndex : 1; // Whether gl_ViewIndex is used - unsigned viewportIndex : 1; // Whether DX SV_ViewportArrayIndex is used - unsigned layerIn : 1; // Whether DX SV_RenderTargetArrayIndex is used + unsigned pointSizeIn : 1; // Whether gl_in[].gl_PointSize is used + unsigned positionIn : 1; // Whether gl_in[].gl_Position is used + unsigned clipDistanceIn : 4; // Array size of gl_in[].gl_ClipDistance[] (0 means unused) + unsigned cullDistanceIn : 4; // Array size of gl_in[].gl_CullDistance[] (0 means unused) + unsigned primitiveIdIn : 1; // Whether gl_PrimitiveIDIn is used + unsigned invocationId : 1; // Whether gl_InvocationID is used + unsigned viewIndex : 1; // Whether gl_ViewIndex is used + unsigned viewportIndexIn : 1; // Whether DX SV_ViewportArrayIndex is used + unsigned layerIn : 1; // Whether DX SV_RenderTargetArrayIndex is used // Output unsigned pointSize : 1; // Whether gl_PointSize is used unsigned position : 1; // Whether gl_Position is used