zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved gl_shader.cpp to 'common'.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-26 22:24:27 +02:00
parent 1346787e29
commit cb1e8a177f
7 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -940,7 +940,6 @@ set (PCH_SOURCES
rendering/2d/v_blend.cpp rendering/2d/v_blend.cpp
rendering/gl/renderer/gl_renderer.cpp rendering/gl/renderer/gl_renderer.cpp
rendering/gl/renderer/gl_stereo3d.cpp rendering/gl/renderer/gl_stereo3d.cpp
rendering/gl/shaders/gl_shader.cpp
rendering/gl/system/gl_framebuffer.cpp rendering/gl/system/gl_framebuffer.cpp
rendering/hwrenderer/hw_entrypoint.cpp rendering/hwrenderer/hw_entrypoint.cpp
rendering/hwrenderer/data/hw_vertexbuilder.cpp rendering/hwrenderer/data/hw_vertexbuilder.cpp
@ -1145,6 +1144,7 @@ set (PCH_SOURCES
common/rendering/gl/gl_buffers.cpp common/rendering/gl/gl_buffers.cpp
common/rendering/gl/gl_hwtexture.cpp common/rendering/gl/gl_hwtexture.cpp
common/rendering/gl/gl_samplers.cpp common/rendering/gl/gl_samplers.cpp
common/rendering/gl/gl_shader.cpp
common/rendering/gl/gl_shaderprogram.cpp common/rendering/gl/gl_shaderprogram.cpp
common/scripting/core/dictionary.cpp common/scripting/core/dictionary.cpp
common/scripting/core/dynarrays.cpp common/scripting/core/dynarrays.cpp

2
src/common/rendering/gl/gl_renderstate.cpp
View file

@ -33,7 +33,7 @@
#include "hw_cvars.h" #include "hw_cvars.h"
#include "flatvertices.h" #include "flatvertices.h"
#include "hwrenderer/scene/hw_skydome.h" #include "hwrenderer/scene/hw_skydome.h"
#include "gl/shaders/gl_shader.h" #include "gl_shader.h"
#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderer.h"
#include "hw_lightbuffer.h" #include "hw_lightbuffer.h"
#include "gl_renderbuffers.h" #include "gl_renderbuffers.h"

3
src/rendering/gl/shaders/gl_shader.cpp → src/common/rendering/gl/gl_shader.cpp
View file

@ -34,7 +34,7 @@
#include "cmdlib.h" #include "cmdlib.h"
#include "md5.h" #include "md5.h"
#include "m_misc.h" #include "m_misc.h"
#include "gl/shaders/gl_shader.h" #include "gl_shader.h"
#include "hw_shaderpatcher.h" #include "hw_shaderpatcher.h"
#include "hwrenderer/data/shaderuniforms.h" #include "hwrenderer/data/shaderuniforms.h"
#include "hwrenderer/scene/hw_viewpointuniforms.h" #include "hwrenderer/scene/hw_viewpointuniforms.h"
@ -44,7 +44,6 @@
#include "gl_debug.h" #include "gl_debug.h"
#include "matrix.h" #include "matrix.h"
#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderer.h"
#include "gl/shaders/gl_shader.h"
#include <map> #include <map>
#include <memory> #include <memory>

0
src/rendering/gl/shaders/gl_shader.h → src/common/rendering/gl/gl_shader.h
View file

2
src/common/rendering/gl/gl_shaderprogram.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include "gl_system.h" #include "gl_system.h"
#include "gl/shaders/gl_shader.h" #include "gl_shader.h"
#include "hwrenderer/postprocessing/hw_postprocess.h" #include "hwrenderer/postprocessing/hw_postprocess.h"
namespace OpenGLRenderer namespace OpenGLRenderer

8
src/rendering/gl/renderer/gl_renderer.cpp
View file

@ -30,22 +30,16 @@
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
** **
*/ */
#include "gl_system.h" #include "gl_system.h"
#include "files.h" #include "files.h"
#include "v_video.h" #include "v_video.h"
#include "m_png.h" #include "m_png.h"
#include "filesystem.h" #include "filesystem.h"
#include "doomstat.h"
#include "i_time.h" #include "i_time.h"
#include "p_effect.h"
#include "d_player.h"
#include "a_dynlight.h"
#include "cmdlib.h" #include "cmdlib.h"
#include "version.h" #include "version.h"
#include "g_game.h"
#include "swrenderer/r_swscene.h"
#include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/utility/hw_clock.h"
#include "gl_interface.h" #include "gl_interface.h"

2
src/rendering/v_framebuffer.cpp
View file

@ -355,7 +355,7 @@ void DFrameBuffer::SetViewportRects(IntRect *bounds)
int screenWidth = GetWidth(); int screenWidth = GetWidth();
int screenHeight = GetHeight(); int screenHeight = GetHeight();
float scaleX, scaleY; float scaleX, scaleY;
scaleX = MIN(clientWidth / (float)screenWidth, clientHeight / ((float)screenHeight * ViewportPixelAspect())); scaleX = std::min(clientWidth / (float)screenWidth, clientHeight / ((float)screenHeight * ViewportPixelAspect()));
scaleY = scaleX * ViewportPixelAspect(); scaleY = scaleX * ViewportPixelAspect();
mOutputLetterbox.width = (int)round(screenWidth * scaleX); mOutputLetterbox.width = (int)round(screenWidth * scaleX);
mOutputLetterbox.height = (int)round(screenHeight * scaleY); mOutputLetterbox.height = (int)round(screenHeight * scaleY);