From a1c2689d1f207e82dc1b39460aec0570cbddf38c Mon Sep 17 00:00:00 2001 From: Spoike Date: Wed, 5 Nov 2014 05:54:29 +0000 Subject: [PATCH] support for gl4 tesselation shaders. glsl code is available separately. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4787 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/d3d/d3d_backend.c | 2 +- engine/gl/gl_backend.c | 4 +--- engine/gl/glsupp.h | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/d3d/d3d_backend.c b/engine/d3d/d3d_backend.c index 460a01fd1..1050ea87a 100644 --- a/engine/d3d/d3d_backend.c +++ b/engine/d3d/d3d_backend.c @@ -1832,7 +1832,7 @@ static void BE_RenderMeshProgram(shader_t *s, unsigned int vertcount, unsigned i if (shaderstate.batchvbo && shaderstate.batchvbo->numbones) { - if (p->permu[perm|PERMUTATION_SKELETAL].handle.glsl) + if (p->permu[perm|PERMUTATION_SKELETAL].handle.hlsl.vert) perm |= PERMUTATION_SKELETAL; else return; diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c index c7b6d2ffe..7e03dd900 100644 --- a/engine/gl/gl_backend.c +++ b/engine/gl/gl_backend.c @@ -2701,7 +2701,6 @@ static void BE_SendPassBlendDepthMask(unsigned int sbits) #endif } -#define GL_PATCHES_ARB 0xe static void BE_SubmitMeshChain(qboolean usetesselation) { int startv, starti, endv, endi; @@ -2715,8 +2714,7 @@ static void BE_SubmitMeshChain(qboolean usetesselation) if (shaderstate.curpatchverts != m) { shaderstate.curpatchverts = m; -#define GL_PATCH_VERTICES 0x8E72 - qglPatchParameteriARB(GL_PATCH_VERTICES, m); + qglPatchParameteriARB(GL_PATCH_VERTICES_ARB, m); } batchtype = GL_PATCHES_ARB; } diff --git a/engine/gl/glsupp.h b/engine/gl/glsupp.h index b0f648897..2fefe29d6 100644 --- a/engine/gl/glsupp.h +++ b/engine/gl/glsupp.h @@ -579,7 +579,9 @@ typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei #define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A #endif -#ifndef GL_ARB_vertex_shader +#ifndef GL_ARB_tessellation_shader +#define GL_PATCHES_ARB 0xE +#define GL_PATCH_VERTICES_ARB 0x8E72 #define GL_TESS_EVALUATION_SHADER_ARB 0x8E87 #define GL_TESS_CONTROL_SHADER_ARB 0x8E88 #endif