Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit d898bc6

Browse files
zhuxingweizhuxingwei
committed
fix shader compile errors when target platform doesn't support compute-shader
1 parent 8c8f807 commit d898bc6

12 files changed

+37
-3
lines changed

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_cb.cginc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ StructuredBuffer<vdata> databuffer;
88
StructuredBuffer<int> indexbuffer;
99
int _startVertex;
1010

11-
v2f vert_compute (uint vertex_id: SV_VertexID, uint instance_id: SV_InstanceID)
11+
v2f vert_compute (uint vertex_id: SV_VertexID)
1212
{
1313
v2f o = (v2f)0;
1414
vdata v = databuffer[indexbuffer[_startVertex + vertex_id]];

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_convexFill_cb.shader

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Shader "UIWidgets/canvas_convexFill_cb"
2020

2121
Pass { // 0, color
2222
CGPROGRAM
23+
#pragma require compute
2324
#define UIWIDGETS_COLOR
2425
#include "../UIWidgets_canvas.cginc"
2526
#include "UIWidgets_canvas_cb.cginc"
@@ -30,6 +31,7 @@ Shader "UIWidgets/canvas_convexFill_cb"
3031

3132
Pass { // 1, linear
3233
CGPROGRAM
34+
#pragma require compute
3335
#define UIWIDGETS_LINEAR
3436
#include "../UIWidgets_canvas.cginc"
3537
#include "UIWidgets_canvas_cb.cginc"
@@ -40,6 +42,7 @@ Shader "UIWidgets/canvas_convexFill_cb"
4042

4143
Pass { // 2, radial
4244
CGPROGRAM
45+
#pragma require compute
4346
#define UIWIDGETS_RADIAL
4447
#include "../UIWidgets_canvas.cginc"
4548
#include "UIWidgets_canvas_cb.cginc"
@@ -50,6 +53,7 @@ Shader "UIWidgets/canvas_convexFill_cb"
5053

5154
Pass { // 3, sweep
5255
CGPROGRAM
56+
#pragma require compute
5357
#define UIWIDGETS_SWEEP
5458
#include "../UIWidgets_canvas.cginc"
5559
#include "UIWidgets_canvas_cb.cginc"
@@ -60,6 +64,7 @@ Shader "UIWidgets/canvas_convexFill_cb"
6064

6165
Pass { // 4, image
6266
CGPROGRAM
67+
#pragma require compute
6368
#define UIWIDGETS_IMAGE
6469
#include "../UIWidgets_canvas.cginc"
6570
#include "UIWidgets_canvas_cb.cginc"

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_fill0_cb.shader

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Shader "UIWidgets/canvas_fill0_cb"
2222

2323
Pass {
2424
CGPROGRAM
25+
#pragma require compute
2526
#include "../UIWidgets_canvas.cginc"
2627
#include "UIWidgets_canvas_cb.cginc"
2728
#pragma vertex vert_compute

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_fill1_cb.shader

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Shader "UIWidgets/canvas_fill1_cb"
2020

2121
Pass { // 0, color
2222
CGPROGRAM
23+
#pragma require compute
2324
#define UIWIDGETS_COLOR
2425
#include "../UIWidgets_canvas.cginc"
2526
#include "UIWidgets_canvas_cb.cginc"
@@ -30,6 +31,7 @@ Shader "UIWidgets/canvas_fill1_cb"
3031

3132
Pass { // 1, linear
3233
CGPROGRAM
34+
#pragma require compute
3335
#define UIWIDGETS_LINEAR
3436
#include "../UIWidgets_canvas.cginc"
3537
#include "UIWidgets_canvas_cb.cginc"
@@ -40,6 +42,7 @@ Shader "UIWidgets/canvas_fill1_cb"
4042

4143
Pass { // 2, radial
4244
CGPROGRAM
45+
#pragma require compute
4346
#define UIWIDGETS_RADIAL
4447
#include "../UIWidgets_canvas.cginc"
4548
#include "UIWidgets_canvas_cb.cginc"
@@ -50,6 +53,7 @@ Shader "UIWidgets/canvas_fill1_cb"
5053

5154
Pass { // 3, sweep
5255
CGPROGRAM
56+
#pragma require compute
5357
#define UIWIDGETS_SWEEP
5458
#include "../UIWidgets_canvas.cginc"
5559
#include "UIWidgets_canvas_cb.cginc"
@@ -60,6 +64,7 @@ Shader "UIWidgets/canvas_fill1_cb"
6064

6165
Pass { // 4, image
6266
CGPROGRAM
67+
#pragma require compute
6368
#define UIWIDGETS_IMAGE
6469
#include "../UIWidgets_canvas.cginc"
6570
#include "UIWidgets_canvas_cb.cginc"

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_filter_cb.shader

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Shader "UIWidgets/canvas_filter_cb"
99

1010
Pass { // 0, mask filter
1111
CGPROGRAM
12+
#pragma require compute
1213
#include "../UIWidgets_canvas.cginc"
1314
#include "UIWidgets_canvas_cb.cginc"
1415
#pragma vertex vert_compute

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_shadowBox_cb.shader

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Shader "UIWidgets/ShadowBox_cb"
2020

2121
Pass {
2222
CGPROGRAM
23+
#pragma require compute
2324

2425
float4 _sb_box;
2526
float4 _viewport;
@@ -60,7 +61,7 @@ Shader "UIWidgets/ShadowBox_cb"
6061
return (integral.z - integral.x) * (integral.w - integral.y);
6162
}
6263

63-
v2f vert(uint vertex_id: SV_VertexID, uint instance_id: SV_InstanceID){
64+
v2f vert(uint vertex_id: SV_VertexID){
6465
v2f o;
6566
vdata v = databuffer[indexbuffer[_startVertex + vertex_id]];
6667
float padding = 3.0 * _sb_sigma;

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_shadowRBox_cb.shader

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Shader "UIWidgets/ShadowRBox_cb"
2121
Pass {
2222
CGPROGRAM
2323

24+
#pragma require compute
25+
2426
float4 _sb_box;
2527
float4 _viewport;
2628
float _sb_sigma;
@@ -92,7 +94,7 @@ Shader "UIWidgets/ShadowRBox_cb"
9294
return value;
9395
}
9496

95-
v2f vert(uint vertex_id: SV_VertexID, uint instance_id: SV_InstanceID){
97+
v2f vert(uint vertex_id: SV_VertexID){
9698
v2f o;
9799
vdata v = databuffer[indexbuffer[_startVertex + vertex_id]];
98100
float padding = 3.0 * _sb_sigma;

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_stencil_cb.shader

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Shader "UIWidgets/canvas_stencil_cb"
1515
}
1616

1717
CGPROGRAM
18+
#pragma require compute
1819
#include "../UIWidgets_canvas.cginc"
1920
#include "UIWidgets_canvas_cb.cginc"
2021
#pragma vertex vert_compute
@@ -32,6 +33,7 @@ Shader "UIWidgets/canvas_stencil_cb"
3233
}
3334

3435
CGPROGRAM
36+
#pragma require compute
3537
#include "../UIWidgets_canvas.cginc"
3638
#include "UIWidgets_canvas_cb.cginc"
3739
#pragma vertex vert_compute
@@ -49,6 +51,7 @@ Shader "UIWidgets/canvas_stencil_cb"
4951
}
5052

5153
CGPROGRAM
54+
#pragma require compute
5255
#include "../UIWidgets_canvas.cginc"
5356
#include "UIWidgets_canvas_cb.cginc"
5457
#pragma vertex vert_compute

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_stroke0_cb.shader

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Shader "UIWidgets/canvas_stroke0_cb"
1919

2020
Pass { // 0, color
2121
CGPROGRAM
22+
#pragma require compute
2223
#define UIWIDGETS_COLOR
2324
#include "../UIWidgets_canvas.cginc"
2425
#include "UIWidgets_canvas_cb.cginc"
@@ -29,6 +30,7 @@ Shader "UIWidgets/canvas_stroke0_cb"
2930

3031
Pass { // 1, linear
3132
CGPROGRAM
33+
#pragma require compute
3234
#define UIWIDGETS_LINEAR
3335
#include "../UIWidgets_canvas.cginc"
3436
#include "UIWidgets_canvas_cb.cginc"
@@ -39,6 +41,7 @@ Shader "UIWidgets/canvas_stroke0_cb"
3941

4042
Pass { // 2, radial
4143
CGPROGRAM
44+
#pragma require compute
4245
#define UIWIDGETS_RADIAL
4346
#include "../UIWidgets_canvas.cginc"
4447
#include "UIWidgets_canvas_cb.cginc"
@@ -49,6 +52,7 @@ Shader "UIWidgets/canvas_stroke0_cb"
4952

5053
Pass { // 3, sweep
5154
CGPROGRAM
55+
#pragma require compute
5256
#define UIWIDGETS_SWEEP
5357
#include "../UIWidgets_canvas.cginc"
5458
#include "UIWidgets_canvas_cb.cginc"
@@ -59,6 +63,7 @@ Shader "UIWidgets/canvas_stroke0_cb"
5963

6064
Pass { // 4, image
6165
CGPROGRAM
66+
#pragma require compute
6267
#define UIWIDGETS_IMAGE
6368
#include "../UIWidgets_canvas.cginc"
6469
#include "UIWidgets_canvas_cb.cginc"

‎Runtime/Resources/shaders/computebuffer/UIWidgets_canvas_stroke1_cb.shader

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Shader "UIWidgets/canvas_stroke1_cb"
1818

1919
Pass {
2020
CGPROGRAM
21+
#pragma require compute
2122
#include "../UIWidgets_canvas.cginc"
2223
#include "UIWidgets_canvas_cb.cginc"
2324
#pragma vertex vert_compute

0 commit comments

Comments
 (0)