Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Changeset 756

Committed by IonutCava on Fri 29 Jul, 2016 16:09:29 +0000

Commit Message:

[IonutCava]
- Cleaned up material shader:
— Add explicit functions for material colour properties
— Separate Phong from PBR
— Remove texture count variable and use TEX_OPERATION_NONE for single texture
- Added a Shader compute queue that all materials share. This allows better frame time allocation for shader compilation
- Attempt to fix Task and TaskPool race conditions

Changes

Added /trunk/Source Code/Geometry/Material/Headers/ShaderComputeQueue.h

Added /trunk/Source Code/Geometry/Material/Headers/ShaderProgramInfo.h

Added /trunk/Source Code/Geometry/Material/ShaderComputeQueue.cpp

Added /trunk/Source Code/Geometry/Material/ShaderProgramInfo.cpp

Added /trunk/assets/shaders/GLSL/fragmentAtoms/pbr.frag

Modified /trunk/Source Code/Core/Headers/TaskPool.h Diff

Modified /trunk/Source Code/Core/TaskPool.cpp Diff

Modified /trunk/Source Code/Geometry/Importer/MeshImporter.cpp Diff

Modified /trunk/Source Code/Geometry/Material/Headers/Material.h Diff

Modified /trunk/Source Code/Geometry/Material/Material.cpp Diff

Modified /trunk/Source Code/Managers/Headers/SceneManager.h Diff

Modified /trunk/Source Code/Managers/SceneManager.cpp Diff

Modified /trunk/Source Code/Platform/Threading/Task.cpp Diff

Modified /trunk/Source Code/Platform/Video/OpenGL/Buffers/Headers/glBufferLockManager.h Diff

Modified /trunk/Source Code/Platform/Video/OpenGL/Buffers/glBufferLockManager.cpp Diff

Modified /trunk/VCData/Divide.sln Diff

Modified /trunk/VCData/VisualStudioProjects/Divide-Engine.vcxproj Diff

Modified /trunk/VCData/VisualStudioProjects/Divide-Engine.vcxproj.filters Diff

Modified /trunk/VCData/VisualStudioProjects/Divide-Platform.vcxproj Diff

Modified /trunk/VCData/VisualStudioProjects/Divide-Platform.vcxproj.filters Diff

Modified /trunk/assets/shaders/GLSL/DeferredShadingPass1.glsl Diff

Modified /trunk/assets/shaders/GLSL/common/nodeBufferedInput.cmn Diff

Modified /trunk/assets/shaders/GLSL/depthPass.glsl Diff

Modified /trunk/assets/shaders/GLSL/fragmentAtoms/BRDF.frag Diff

Modified /trunk/assets/shaders/GLSL/fragmentAtoms/materialData.frag Diff

Modified /trunk/assets/shaders/GLSL/fragmentAtoms/phong_lighting.frag Diff

Modified /trunk/assets/shaders/GLSL/fragmentAtoms/utility.frag Diff

Modified /trunk/assets/shaders/GLSL/material.glsl Diff

Modified /trunk/assets/shaders/GLSL/terrain.glsl Diff

Modified /trunk/assets/shaders/GLSL/water.glsl Diff