BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DebugChanges

Browse Source
This commit is contained in:
Tleety
2015-12-15 15:39:23 +01:00
parent 1e370bac13
commit 1431bd1a11
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Shaders/cullLights.comp.glsl
+5 -5
View File
@@ -67,7 +67,7 @@ shared int GroupLightCount;
shared int GroupLightIndexStartOffset; shared int GroupLightIndexStartOffset;
shared int GroupLightIndex[MAX_LIGHTS_PER_TILE]; shared int GroupLightIndex[MAX_LIGHTS_PER_TILE];
shared Frustum GroupFrustum; shared Frustum GroupFrustum;
uint GroupIndex; int GroupIndex;
bool SphereInsidePlane(vec3 center, float radius, Plane plane) bool SphereInsidePlane(vec3 center, float radius, Plane plane)
{ {
@@ -94,9 +94,9 @@ bool SphereInsideFrustrum(vec3 center, float radius, Frustum frustum/*, float zN
return result; return result;
} }
void AppendLight(uint li) void AppendLight(int li)
{ {
uint index; int index;
index = atomicAdd(GroupLightCount, 1); index = atomicAdd(GroupLightCount, 1);
if( index < MAX_LIGHTS_PER_TILE ) if( index < MAX_LIGHTS_PER_TILE )
{ {
@@ -107,7 +107,7 @@ void AppendLight(uint li)
layout (local_size_x = 16, local_size_y = 16, local_size_z = 1) in; layout (local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
void main () void main ()
{ {
GroupIndex = gl_WorkGroupID.x + gl_WorkGroupID.y * gl_NumWorkGroups.y; GroupIndex = int(gl_WorkGroupID.x + gl_WorkGroupID.y * gl_NumWorkGroups.y);
if(gl_LocalInvocationIndex == 0) if(gl_LocalInvocationIndex == 0)
{ {
GroupLightCount = 0; GroupLightCount = 0;
@@ -118,7 +118,7 @@ void main ()
memoryBarrierShared(); memoryBarrierShared();
barrier(); barrier();
for(uint i = gl_LocalInvocationIndex; i < PointLights.List.length(); i += TILE_SIZE*TILE_SIZE) for(int i = int(gl_LocalInvocationIndex); i < PointLights.List.length(); i += TILE_SIZE*TILE_SIZE)
{ {
PointLight light = PointLights.List[i]; PointLight light = PointLights.List[i];
src/Engine/Rendering/Renderer.cpp
+6
View File
@@ -283,6 +283,12 @@ void Renderer::TEMPCreateLights()
void Renderer::CullLights() void Renderer::CullLights()
{ {
GLERROR("CullLights Error: Pre"); GLERROR("CullLights Error: Pre");
m_LightOffset = 0;
glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightOffsetSSBO);
glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightOffset), &m_LightOffset, GL_DYNAMIC_COPY);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, m_LightOffsetSSBO);
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
m_LightCullProgram->Bind(); m_LightCullProgram->Bind();
glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "V"), 1, false, glm::value_ptr(m_Camera->ViewMatrix())); glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "V"), 1, false, glm::value_ptr(m_Camera->ViewMatrix()));