OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Create wall surfaces directly from the HWWall output

Browse source
This commit is contained in:
dpjudas 2023-10-27 23:18:44 +02:00 • committed by Magnus Norddahl
commit 9ca058ccc9
7 changed files with 100 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/rendering/hwrenderer/data/hw_levelmesh.h
View file

@ -18,6 +18,7 @@ typedef dp::rect_pack::RectPacker<int> RectPacker;
class LevelSubmesh;
class FMaterial;
class FGameTexture;
class LevelMeshLight
{
@ -58,7 +59,7 @@ struct LevelMeshSurface
bool NeedsUpdate = true;
bool AlwaysUpdate = false;
FTextureID texture = FNullTextureID();
FGameTexture* texture = nullptr;
float alpha = 1.0;
int portalIndex = 0;

4
src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp
View file

@ -305,9 +305,9 @@ void VkRaytrace::UploadMeshes(bool dynamicOnly)
info.SamplingDistance = (float)surface->sampleDimension;
info.Sky = surface->bSky;
info.Alpha = surface->alpha;
if (surface->texture.isValid())
if (surface->texture)
{
auto mat = FMaterial::ValidateTexture(TexMan.GetGameTexture(surface->texture), 0);
auto mat = FMaterial::ValidateTexture(surface->texture, 0);
info.TextureIndex = fb->GetBindlessTextureIndex(mat, CLAMP_NONE, 0);
}
else