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

Fix resolution scaling

Browse source
This commit is contained in:
Brad Davis 2018-07-30 10:57:23 -07:00 committed by Bradley Austin Davis
parent 8eb97dc79c
commit eca803503c
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/DrawTextureOpaque.slf
View file

@ -18,7 +18,7 @@
layout(binding=0) uniform sampler2D colorMap;
layout(location=GPU_ATTR_TEXCOORD0) in vec2 varTexCoord0;
layout(location=0) in vec2 varTexCoord0;
layout(location=0) out vec4 outFragColor;

30
libraries/render-utils/src/standardDrawTextureNoBlend.slf Normal file
View file

@ -0,0 +1,30 @@
<@include gpu/Config.slh@>
<$VERSION_HEADER$>
// Generated on <$_SCRIBE_DATE$>
// standardDrawTexture.frag
// fragment shader
//
// Created by Sam Gateau on 6/10/15.
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
<@include gpu/ShaderConstants.h@>
// the texture
layout(binding=0) uniform sampler2D colorMap;
layout(location=GPU_ATTR_POSITION) in vec3 varPosition;
layout(location=GPU_ATTR_NORMAL) in vec3 varNormal;
layout(location=GPU_ATTR_TEXCOORD0) in vec2 varTexCoord0;
layout(location=GPU_ATTR_COLOR) in vec4 varColor;
layout(location=0) out vec4 outFragColor;
void main(void) {
vec4 color = texture(colorMap, varTexCoord0);
outFragColor = color * varColor;
outFragColor.a = 1.0;
}

2
libraries/shaders/CMakeLists.txt
View file

@ -80,7 +80,7 @@ AUTOSCRIBE_PROGRAM(NAME ssao_debugOcclusion VERTEX gpu::vertex::DrawViewportQuad
AUTOSCRIBE_PROGRAM(NAME stencil_drawMask VERTEX gpu::vertex::DrawUnitQuadTexcoord)
AUTOSCRIBE_PROGRAM(NAME standardDrawTexture VERTEX standardTransformPNTC)
AUTOSCRIBE_PROGRAM(NAME standardDrawTextureNoBlend VERTEX standardTransformPNTC FRAGMENT gpu::fragment::DrawTextureOpaque)
AUTOSCRIBE_PROGRAM(NAME standardDrawTextureNoBlend VERTEX standardTransformPNTC)
AUTOSCRIBE_PROGRAM(NAME subsurfaceScattering_makeProfile VERTEX gpu::vertex::DrawUnitQuadTexcoord)
AUTOSCRIBE_PROGRAM(NAME subsurfaceScattering_makeLUT VERTEX gpu::vertex::DrawUnitQuadTexcoord)