From 5c069300ed6928d684caae005b3ce5b679d9b486 Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 1 Mar 2019 23:16:01 +0000 Subject: [PATCH] missing gl define git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5421 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/glsupp.h | 3 +++ engine/shaders/glsl/defaultskin.glsl | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/engine/gl/glsupp.h b/engine/gl/glsupp.h index 577ae195..fb6d114a 100644 --- a/engine/gl/glsupp.h +++ b/engine/gl/glsupp.h @@ -84,6 +84,9 @@ extern qlpSelTexFUNC qglClientActiveTextureARB; #ifndef GL_HALF_FLOAT_OES #define GL_HALF_FLOAT_OES 0x8D61 /*GL_OES_texture_half_float*/ #endif +#ifndef GL_UNSIGNED_INT_24_8 +#define GL_UNSIGNED_INT_24_8 0x84FA +#endif #ifndef GL_ARB_multitexture #define GL_ARB_multitexture 1 diff --git a/engine/shaders/glsl/defaultskin.glsl b/engine/shaders/glsl/defaultskin.glsl index 51c6e789..37ea7dd9 100644 --- a/engine/shaders/glsl/defaultskin.glsl +++ b/engine/shaders/glsl/defaultskin.glsl @@ -13,10 +13,13 @@ !!cvardf r_tessellation_level=5 !!samps !EIGHTBIT diffuse normalmap specular fullbright upper lower reflectmask reflectcube !!samps =EIGHTBIT paletted 1 -//!!permu VC -- adds rgba vertex colour multipliers -//!!permu SPECULAR -- auto-added when gl_specular>0 -//!!permu OFFSETMAPPING -- auto-added when r_glsl_offsetmapping is set -//!!permu NONORMALS -- states that there's no normals available, which affects lighting. +//!!permu VC // adds rgba vertex colour multipliers +//!!permu SPECULAR // auto-added when gl_specular>0 +//!!permu OFFSETMAPPING // auto-added when r_glsl_offsetmapping is set +//!!permu NONORMALS // states that there's no normals available, which affects lighting. +//!!permu ORM // specularmap is r:Occlusion, g:Roughness, b:Metalness +//!!permu F0R // specularmap is rgb:F0, a:Roughness (instead of exponent) +//!!permu PBR // an attempt at pbr logic #include "sys/defs.h"