OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2

Browse source 
# Conflicts:
#	src/common/rendering/gl/gl_shader.cpp
#	src/common/rendering/hwrenderer/data/buffers.h
#	src/common/rendering/v_video.h
This commit is contained in:
nashmuhandes 2022-01-16 01:57:38 +08:00
commit 57112742fe
298 changed files with 7614 additions and 3373 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/rendering/vulkan/shaders/vk_shader.cpp
View file

@ -150,7 +150,7 @@ static const char *shaderBindings = R"(
int useVertexData;
vec4 uVertexColor;
vec4 uVertexNormal;
vec4 uGlowTopPlane;
vec4 uGlowTopColor;
vec4 uGlowBottomPlane;