Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 08:37:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR feedback: structure alignement and size

Browse source
This commit is contained in:
Brad Davis 2018-09-06 09:07:53 -07:00
parent 9a28e04e37
commit 50f4932d9c
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -1609,7 +1609,7 @@ PolyVoxEntityRenderer::PolyVoxEntityRenderer(const EntityItemPointer& entity) :
_vertexFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); _vertexFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
_vertexFormat->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 12); _vertexFormat->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 12);
}); });
_params = std::make_shared<gpu::Buffer>(sizeof(glm::vec3), nullptr); _params = std::make_shared<gpu::Buffer>(sizeof(glm::vec4), nullptr);
} }
ShapeKey PolyVoxEntityRenderer::getShapeKey() { ShapeKey PolyVoxEntityRenderer::getShapeKey() {
@ -1673,7 +1673,7 @@ void PolyVoxEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& s
void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) { void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
_lastVoxelToWorldMatrix = entity->voxelToWorldMatrix(); _lastVoxelToWorldMatrix = entity->voxelToWorldMatrix();
_lastVoxelVolumeSize = entity->getVoxelVolumeSize(); _lastVoxelVolumeSize = entity->getVoxelVolumeSize();
_params->setSubData(0, _lastVoxelVolumeSize); _params->setSubData(0, vec4(_lastVoxelVolumeSize, 0.0));
graphics::MeshPointer newMesh; graphics::MeshPointer newMesh;
entity->withReadLock([&] { entity->withReadLock([&] {
newMesh = entity->_mesh; newMesh = entity->_mesh;

2
libraries/entities-renderer/src/polyvox.slf
View file

@ -25,7 +25,7 @@ layout(binding=ENTITIES_TEXTURE_POLYVOX_YMAP) uniform sampler2D yMap;
layout(binding=ENTITIES_TEXTURE_POLYVOX_ZMAP) uniform sampler2D zMap; layout(binding=ENTITIES_TEXTURE_POLYVOX_ZMAP) uniform sampler2D zMap;
struct PolyvoxParams { struct PolyvoxParams {
vec3 voxelVolumeSize; vec4 voxelVolumeSize;
}; };
layout(binding=0) uniform polyvoxParamsBuffer { layout(binding=0) uniform polyvoxParamsBuffer {

2
libraries/entities-renderer/src/polyvox_fade.slf
View file

@ -28,7 +28,7 @@ layout(binding=ENTITIES_TEXTURE_POLYVOX_YMAP) uniform sampler2D yMap;
layout(binding=ENTITIES_TEXTURE_POLYVOX_ZMAP) uniform sampler2D zMap; layout(binding=ENTITIES_TEXTURE_POLYVOX_ZMAP) uniform sampler2D zMap;
struct PolyvoxParams { struct PolyvoxParams {
vec3 voxelVolumeSize; vec4 voxelVolumeSize;
}; };
layout(binding=0) uniform polyvoxParamsBuffer { layout(binding=0) uniform polyvoxParamsBuffer {

6
libraries/render-utils/src/AntialiasingEffect.cpp
View file

@ -90,7 +90,7 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
batch.setViewportTransform(args->_viewport); batch.setViewportTransform(args->_viewport);
if (!_paramsBuffer) { if (!_paramsBuffer) {
_paramsBuffer = std::make_shared<gpu::Buffer>(sizeof(glm::vec2), nullptr); _paramsBuffer = std::make_shared<gpu::Buffer>(sizeof(glm::vec4), nullptr);
} }
{ {
@ -109,7 +109,7 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
_antialiasingBuffer->setRenderBuffer(0, _antialiasingTexture); _antialiasingBuffer->setRenderBuffer(0, _antialiasingTexture);
glm::vec2 fbExtent { args->_viewport.z, args->_viewport.w }; glm::vec2 fbExtent { args->_viewport.z, args->_viewport.w };
glm::vec2 inverseFbExtent = 1.0f / fbExtent; glm::vec2 inverseFbExtent = 1.0f / fbExtent;
_paramsBuffer->setSubData(0, inverseFbExtent); _paramsBuffer->setSubData(0, glm::vec4(inverseFbExtent, 0.0, 0.0));
} }
} }
@ -280,7 +280,7 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
batch.setResourceFramebufferSwapChainTexture(0, _antialiasingBuffers, 1); batch.setResourceFramebufferSwapChainTexture(0, _antialiasingBuffers, 1);
// Disable sharpen if FXAA // Disable sharpen if FXAA
if (!_blendParamsBuffer) { if (!_blendParamsBuffer) {
_blendParamsBuffer = std::make_shared<gpu::Buffer>(sizeof(float), nullptr); _blendParamsBuffer = std::make_shared<gpu::Buffer>(sizeof(glm::vec4), nullptr);
} }
_blendParamsBuffer->setSubData(0, _sharpen * _params.get().regionInfo.z); _blendParamsBuffer->setSubData(0, _sharpen * _params.get().regionInfo.z);
batch.setUniformBuffer(0, _blendParamsBuffer); batch.setUniformBuffer(0, _blendParamsBuffer);

4
libraries/render-utils/src/fxaa_blend.slf
View file

@ -20,7 +20,7 @@ layout(location=0) out vec4 outFragColor;
layout(binding=0) uniform sampler2D colorTexture; layout(binding=0) uniform sampler2D colorTexture;
struct FxaaBlendParams { struct FxaaBlendParams {
float sharpenIntensity; vec4 sharpenIntensity;
}; };
layout(binding=0) uniform fxaaBlendParamsBuffer { layout(binding=0) uniform fxaaBlendParamsBuffer {
@ -46,5 +46,5 @@ void main(void) {
vec4 minColor = max(vec4(0), pixels[4]-vec4(0.5)); vec4 minColor = max(vec4(0), pixels[4]-vec4(0.5));
vec4 maxColor = pixels[4]+vec4(0.5); vec4 maxColor = pixels[4]+vec4(0.5);
outFragColor = clamp(pixels[4] + sharpenedPixel * params.sharpenIntensity, minColor, maxColor); outFragColor = clamp(pixels[4] + sharpenedPixel * params.sharpenIntensity.x, minColor, maxColor);
} }

4
libraries/render-utils/src/sdf_text3D.slf
View file

@ -17,7 +17,7 @@ layout(binding=0) uniform sampler2D Font;
struct TextParams { struct TextParams {
vec4 color; vec4 color;
float outline; vec4 outline;
}; };
layout(binding=0) uniform textParamsBuffer { layout(binding=0) uniform textParamsBuffer {
@ -39,7 +39,7 @@ const float taaBias = pow(2.0, TAA_TEXTURE_LOD_BIAS);
float evalSDF(vec2 texCoord) { float evalSDF(vec2 texCoord) {
// retrieve signed distance // retrieve signed distance
float sdf = textureLod(Font, texCoord, TAA_TEXTURE_LOD_BIAS).g; float sdf = textureLod(Font, texCoord, TAA_TEXTURE_LOD_BIAS).g;
if (params.outline > 0.0) { if (params.outline.x > 0.0) {
if (sdf > interiorCutoff) { if (sdf > interiorCutoff) {
sdf = 1.0 - sdf; sdf = 1.0 - sdf;
} else { } else {

4
libraries/render-utils/src/sdf_text3D_transparent.slf
View file

@ -17,7 +17,7 @@ layout(binding=0) uniform sampler2D Font;
struct TextParams { struct TextParams {
vec4 color; vec4 color;
float outline; vec4 outline;
}; };
layout(binding=0) uniform textParamsBuffer { layout(binding=0) uniform textParamsBuffer {
@ -38,7 +38,7 @@ const float outlineExpansion = 0.2;
void main() { void main() {
// retrieve signed distance // retrieve signed distance
float sdf = texture(Font, _texCoord0).g; float sdf = texture(Font, _texCoord0).g;
if (params.outline > 0.0) { if (params.outline.x > 0.0) {
if (sdf > interiorCutoff) { if (sdf > interiorCutoff) {
sdf = 1.0 - sdf; sdf = 1.0 - sdf;
} else { } else {

4
libraries/render-utils/src/text/Font.cpp
View file

@ -356,7 +356,7 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
struct GpuDrawParams { struct GpuDrawParams {
glm::vec4 color; glm::vec4 color;
float outline; glm::vec4 outline;
}; };
if (!drawInfo.paramsBuffer || drawInfo.params.color != color || drawInfo.params.effect != effectType) { if (!drawInfo.paramsBuffer || drawInfo.params.color != color || drawInfo.params.effect != effectType) {
@ -364,7 +364,7 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
drawInfo.params.effect = effectType; drawInfo.params.effect = effectType;
GpuDrawParams gpuDrawParams; GpuDrawParams gpuDrawParams;
gpuDrawParams.color = ColorUtils::sRGBToLinearVec4(drawInfo.params.color); gpuDrawParams.color = ColorUtils::sRGBToLinearVec4(drawInfo.params.color);
gpuDrawParams.outline = (drawInfo.params.effect == OUTLINE_EFFECT) ? 1 : 0; gpuDrawParams.outline.x = (drawInfo.params.effect == OUTLINE_EFFECT) ? 1 : 0;
drawInfo.paramsBuffer = std::make_shared<gpu::Buffer>(sizeof(GpuDrawParams), nullptr); drawInfo.paramsBuffer = std::make_shared<gpu::Buffer>(sizeof(GpuDrawParams), nullptr);
drawInfo.paramsBuffer->setSubData(0, sizeof(GpuDrawParams), (const gpu::Byte*)&gpuDrawParams); drawInfo.paramsBuffer->setSubData(0, sizeof(GpuDrawParams), (const gpu::Byte*)&gpuDrawParams);
} }