ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

gpu: rename length to size in shaders

Browse Source 
`.length` has special meaning in glsl, and the verifier got upset that
we were shadowing it
This commit is contained in:
Max Weber
2020-02-11 18:54:01 -05:00
committed by Adam
parent 7e8bebc083
commit a330631945
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/comp.glsl
+1 -1
View File
@@ -44,7 +44,7 @@ void main() {
uint groupId = gl_WorkGroupID.x; uint groupId = gl_WorkGroupID.x;
uint localId = gl_LocalInvocationID.x * 4; uint localId = gl_LocalInvocationID.x * 4;
modelinfo minfo = ol[groupId]; modelinfo minfo = ol[groupId];
int length = minfo.length; int length = minfo.size;
if (localId == 0) { if (localId == 0) {
min10 = 1600; min10 = 1600;
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/comp_common.glsl
+1 -1
View File
@@ -41,7 +41,7 @@
struct modelinfo { struct modelinfo {
int offset; // offset into buffer int offset; // offset into buffer
int uvOffset; // offset into uv buffer int uvOffset; // offset into uv buffer
int length; // length in faces int size; // length in faces
int idx; // write idx in target buffer int idx; // write idx in target buffer
int flags; // radius, orientation int flags; // radius, orientation
int x; // scene position x int x; // scene position x
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/comp_unordered.glsl
+2 -2
View File
@@ -37,14 +37,14 @@ void main() {
modelinfo minfo = ol[groupId]; modelinfo minfo = ol[groupId];
int offset = minfo.offset; int offset = minfo.offset;
int length = minfo.length; int size = minfo.size;
int outOffset = minfo.idx; int outOffset = minfo.idx;
int uvOffset = minfo.uvOffset; int uvOffset = minfo.uvOffset;
int flags = minfo.flags; int flags = minfo.flags;
int orientation = flags & 0x7ff; int orientation = flags & 0x7ff;
ivec4 pos = ivec4(minfo.x, minfo.y, minfo.z, 0); ivec4 pos = ivec4(minfo.x, minfo.y, minfo.z, 0);
if (localId >= length) { if (localId >= size) {
return; return;
} }
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/priority_render.glsl
+10 -10
View File
@@ -113,7 +113,7 @@ int count_prio_offset(int priority) {
void get_face(uint localId, modelinfo minfo, int cameraYaw, int cameraPitch, int centerX, int centerY, int zoom, void get_face(uint localId, modelinfo minfo, int cameraYaw, int cameraPitch, int centerX, int centerY, int zoom,
out int prio, out int dis, out ivec4 o1, out ivec4 o2, out ivec4 o3) { out int prio, out int dis, out ivec4 o1, out ivec4 o2, out ivec4 o3) {
int offset = minfo.offset; int offset = minfo.offset;
int length = minfo.length; int size = minfo.size;
int flags = minfo.flags; int flags = minfo.flags;
int radius = (flags & 0x7fffffff) >> 12; int radius = (flags & 0x7fffffff) >> 12;
int orientation = flags & 0x7ff; int orientation = flags & 0x7ff;
@@ -121,7 +121,7 @@ void get_face(uint localId, modelinfo minfo, int cameraYaw, int cameraPitch, int
uint ssboOffset; uint ssboOffset;
if (localId < length) { if (localId < size) {
ssboOffset = localId; ssboOffset = localId;
} else { } else {
ssboOffset = 0; ssboOffset = 0;
@@ -148,7 +148,7 @@ void get_face(uint localId, modelinfo minfo, int cameraYaw, int cameraPitch, int
int thisPriority, thisDistance; int thisPriority, thisDistance;
if (localId < length) { if (localId < size) {
// rotate for model orientation // rotate for model orientation
thisrvA = rotate(thisA, orientation); thisrvA = rotate(thisA, orientation);
thisrvB = rotate(thisB, orientation); thisrvB = rotate(thisB, orientation);
@@ -186,14 +186,14 @@ void get_face(uint localId, modelinfo minfo, int cameraYaw, int cameraPitch, int
} }
int map_face_priority(uint localId, modelinfo minfo, int thisPriority, int thisDistance, out int prio) { int map_face_priority(uint localId, modelinfo minfo, int thisPriority, int thisDistance, out int prio) {
int length = minfo.length; int size = minfo.size;
// Compute average distances for 0/2, 3/4, and 6/8 // Compute average distances for 0/2, 3/4, and 6/8
int adjPrio; int adjPrio;
int prioIdx; int prioIdx;
if (localId < length) { if (localId < size) {
int avg1 = 0; int avg1 = 0;
int avg2 = 0; int avg2 = 0;
int avg3 = 0; int avg3 = 0;
@@ -224,9 +224,9 @@ int map_face_priority(uint localId, modelinfo minfo, int thisPriority, int thisD
} }
void insert_dfs(uint localId, modelinfo minfo, int adjPrio, int distance, int prioIdx) { void insert_dfs(uint localId, modelinfo minfo, int adjPrio, int distance, int prioIdx) {
int length = minfo.length; int size = minfo.size;
if (localId < length) { if (localId < size) {
// calculate base offset into dfs based on number of faces with a lower priority // calculate base offset into dfs based on number of faces with a lower priority
int baseOff = count_prio_offset(adjPrio); int baseOff = count_prio_offset(adjPrio);
// store into face array offset array by unique index // store into face array offset array by unique index
@@ -236,14 +236,14 @@ void insert_dfs(uint localId, modelinfo minfo, int adjPrio, int distance, int pr
void sort_and_insert(uint localId, modelinfo minfo, int thisPriority, int thisDistance, ivec4 thisrvA, ivec4 thisrvB, ivec4 thisrvC) { void sort_and_insert(uint localId, modelinfo minfo, int thisPriority, int thisDistance, ivec4 thisrvA, ivec4 thisrvB, ivec4 thisrvC) {
/* compute face distance */ /* compute face distance */
int length = minfo.length; int size = minfo.size;
int outOffset = minfo.idx; int outOffset = minfo.idx;
int uvOffset = minfo.uvOffset; int uvOffset = minfo.uvOffset;
int flags = minfo.flags; int flags = minfo.flags;
ivec4 pos = ivec4(minfo.x, minfo.y, minfo.z, 0); ivec4 pos = ivec4(minfo.x, minfo.y, minfo.z, 0);
int start, end, myOffset; int start, end, myOffset;
if (localId < length) { if (localId < size) {
const int priorityOffset = count_prio_offset(thisPriority); const int priorityOffset = count_prio_offset(thisPriority);
const int numOfPriority = totalMappedNum[thisPriority]; const int numOfPriority = totalMappedNum[thisPriority];
start = priorityOffset; // index of first face with this priority start = priorityOffset; // index of first face with this priority
@@ -253,7 +253,7 @@ void sort_and_insert(uint localId, modelinfo minfo, int thisPriority, int thisDi
start = end = myOffset = 0; start = end = myOffset = 0;
} }
if (localId < length) { if (localId < size) {
// we only have to order faces against others of the same priority // we only have to order faces against others of the same priority
// calculate position this face will be in // calculate position this face will be in
for (int i = start; i < end; ++i) { for (int i = start; i < end; ++i) {