Skip to content

renderer: factorize and move some computation done every frame for every surface in tr_shade to be done only once in tr_shader #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
illwieckz merged 4 commits into from
Apr 14, 2020
Merged

renderer: factorize and move some computation done every frame for every surface in tr_shade to be done only once in tr_shader #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de299fb
tr_shader: store heathaze and liquid normal map in normal map slot
illwieckz Apr 13, 2020
43623bd
tr_shader: prepare to precompute stuff at shader parsing instead of d…
illwieckz Apr 13, 2020
50723fd
renderer: compute feature enablement in tr_shader instead of tr_shade
illwieckz Apr 13, 2020
b102902
renderer: set texture fallback in tr_shader instead of tr_shade
illwieckz Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/engine/renderer/tr_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
bool tcGen_Environment;
bool tcGen_Lightmap;

bool heightMapInNormalMap; // material has normalmap suited for parallax mapping
bool implicitLightmap;

Color::Color32Bit constantColor; // for CGEN_CONST and AGEN_CONST
Expand Down Expand Up @@ -1125,6 +1124,22 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
expression_t fresnelScaleExp;
expression_t fresnelBiasExp;

// Available textures.
bool hasNormalMap;
bool hasHeightMap;
bool isHeightMapInNormalMap;
bool hasMaterialMap;
bool isMaterialPhysical;
bool hasGlowMap;

// Available features.
bool enableNormalMapping;
bool enableDeluxeMapping;
bool enableParallaxMapping;
bool enablePhysicalMapping;
bool enableSpecularMapping;
bool enableGlowMapping;

// normalMap channel scale, negative value flips channel
bool hasNormalScale;
vec3_t normalScale;
Expand Down Expand Up @@ -1212,7 +1227,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
fogPass_t fogPass; // draw a blended pass, possibly with depth test equals
bool noFog;

bool heightMapInNormalMap; // material has normalmap suited for parallax mapping
bool noParallax; // disable parallax for this material even if it's available
float parallaxOffsetBias; // offset the heightmap top relatively to the floor
float parallaxDepthScale; // per-shader parallax depth scale
Expand Down
Loading