Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-17 06:30:44 +01:00
Code Issues Projects Releases Wiki Activity

remove material flags

Browse Source
This commit is contained in:
Ivan Avdeev 2021-09-06 14:14:24 -07:00 committed by Ivan Avdeev
parent de611e159a
commit ae12b4505d
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ref_vk/shaders/ray.rchit
View File

@ -106,5 +106,4 @@ void main() {
payload.emissive = kusochki[kusok_index].emissive * base_color; // TODO emissive should have a special texture
payload.roughness = kusochki[kusok_index].roughness;
payload.kusok_index = kusok_index;
payload.material_flags = kusochki[kusok_index].material_flags;
}

1
ref_vk/shaders/ray_common.glsl
View File

@ -8,5 +8,4 @@ struct RayPayload {
vec3 emissive;
float roughness;
int kusok_index;
uint material_flags;
};

10
ref_vk/shaders/ray_interop.h
View File

@ -22,18 +22,14 @@ struct Kusok {
// Material
uint texture;
float roughness;
uint material_flags;
PAD(2)
vec4 color;
vec3 emissive;
PAD(1)
//PAD(1)
vec4 color;
float roughness;
};
#define kXVkMaterialFlagLighting (1<<0)
#ifndef GLSL
#undef uint
#undef vec3

10
ref_vk/vk_ray_model.c
View File

@ -220,11 +220,6 @@ vk_ray_model_t* VK_RayModelCreate( vk_ray_model_init_t args ) {
kusochki[i].roughness = mg->material == kXVkMaterialWater ? 0. : 1.; // FIXME
VectorSet(kusochki[i].emissive, 0, 0, 0 );
// We don't know render_mode yet
// TODO: assume diffuse-only surface by default?
// TODO: does this affect BLAS building?
kusochki[i].material_flags = 0; // kXVkMaterialFlagDiffuse;
mg->kusok_index = i + kusochki_count_offset;
}
@ -284,7 +279,6 @@ void VK_RayModelDestroy( struct vk_ray_model_s *model ) {
}
void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render_model, const matrix3x4 *transform_row, const vec4_t color) {
uint32_t material_flags = 0;
qboolean reflective = false;
qboolean force_emissive = false;
qboolean additive = false;
@ -312,13 +306,11 @@ void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render
switch (render_model->render_mode) {
case kRenderNormal:
material_flags = kXVkMaterialFlagLighting;
break;
// C = (1 - alpha) * DST + alpha * SRC (TODO is this right?)
case kRenderTransColor:
case kRenderTransTexture:
material_flags = kXVkMaterialFlagLighting;// | kXVkMaterialFlagRefractive;
reflective = true;
draw_model->alpha_test = true;
break;
@ -333,7 +325,6 @@ void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render
// Alpha test (TODO additive? mixing?)
case kRenderTransAlpha:
material_flags = kXVkMaterialFlagLighting;
draw_model->alpha_test = true;
break;
@ -351,7 +342,6 @@ void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render
const vk_emissive_surface_t *esurf = VK_LightsAddEmissiveSurface( geom, transform_row );
vk_kusok_data_t *kusok = (vk_kusok_data_t*)(g_ray_model_state.kusochki_buffer.mapped) + geom->kusok_index;
kusok->texture = geom->texture;
kusok->material_flags = material_flags;
// HACK until there is proper specular
// FIXME also this erases previour roughness unconditionally