Merge branch 'vulkan' into patch
This commit is contained in:
commit
c4c97b2822
|
@ -604,7 +604,7 @@ void VK_LightsAddEmissiveSurface( const struct vk_render_geometry_s *geom, const
|
||||||
if (!geom->surf)
|
if (!geom->surf)
|
||||||
goto fin; // TODO break? no surface means that model is not brush
|
goto fin; // TODO break? no surface means that model is not brush
|
||||||
|
|
||||||
if (geom->material != kXVkMaterialSky && geom->material != kXVkMaterialEmissive && !g_lights.map.emissive_textures[texture_num].set)
|
if (/* geom->material != kXVkMaterialSky && */geom->material != kXVkMaterialEmissive && !g_lights.map.emissive_textures[texture_num].set)
|
||||||
goto fin;
|
goto fin;
|
||||||
|
|
||||||
if (g_lights.num_emissive_surfaces >= 256)
|
if (g_lights.num_emissive_surfaces >= 256)
|
||||||
|
@ -634,7 +634,7 @@ void VK_LightsAddEmissiveSurface( const struct vk_render_geometry_s *geom, const
|
||||||
|
|
||||||
// Insert into emissive surfaces
|
// Insert into emissive surfaces
|
||||||
esurf->kusok_index = geom->kusok_index;
|
esurf->kusok_index = geom->kusok_index;
|
||||||
if (geom->material != kXVkMaterialSky && geom->material != kXVkMaterialEmissive) {
|
if (/* geom->material != kXVkMaterialSky && */geom->material != kXVkMaterialEmissive) {
|
||||||
VectorCopy(g_lights.map.emissive_textures[texture_num].emissive, esurf->emissive);
|
VectorCopy(g_lights.map.emissive_textures[texture_num].emissive, esurf->emissive);
|
||||||
} else {
|
} else {
|
||||||
// TODO see #227
|
// TODO see #227
|
||||||
|
|
Loading…
Reference in New Issue