Skip to content

Commit abc6500

Browse files
committed
Fixed xrRender_GL compilation after glslang removal
Sorry.
1 parent 8363a98 commit abc6500

File tree

3 files changed

+1
-105
lines changed

3 files changed

+1
-105
lines changed

src/Layers/xrRender/HW.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class CHW
6565
GLuint pCFB;
6666

6767
CHWCaps Caps;
68-
TBuiltInResource resources;
6968

7069
HWND m_hWnd;
7170
HDC m_hDC;
@@ -125,9 +124,7 @@ class CHW
125124
#if !defined(_MAYA_EXPORT) && !defined(USE_OGL)
126125
stats_manager stats_manager;
127126
#endif
128-
#ifdef USE_OGL
129-
void InitResources(TBuiltInResource& Resources);
130-
#endif
127+
131128
#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
132129
void UpdateViews();
133130
#endif

src/Layers/xrRenderGL/glHW.cpp

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ void CHW::CreateDevice(HWND hWnd, bool move_window)
133133
updateWindowProps(m_hWnd);
134134
fill_vid_mode_list(this);
135135
#endif
136-
137-
InitResources(resources);
138136
}
139137

140138
void CHW::DestroyDevice()
@@ -291,104 +289,6 @@ void fill_vid_mode_list(CHW* /*_hw*/)
291289
Msg("[%s]", mode.name);
292290
}
293291

294-
295-
void CHW::InitResources(TBuiltInResource& Resources)
296-
{
297-
Resources.maxLights = 32;
298-
Resources.maxClipPlanes = 6;
299-
Resources.maxTextureUnits = 32;
300-
Resources.maxTextureCoords = 32;
301-
Resources.maxVertexAttribs = 64;
302-
Resources.maxVertexUniformComponents = 4096;
303-
Resources.maxVaryingFloats = 64;
304-
Resources.maxVertexTextureImageUnits = 32;
305-
Resources.maxCombinedTextureImageUnits = 80;
306-
Resources.maxTextureImageUnits = 32;
307-
Resources.maxFragmentUniformComponents = 4096;
308-
Resources.maxDrawBuffers = 32;
309-
Resources.maxVertexUniformVectors = 128;
310-
Resources.maxVaryingVectors = 8;
311-
Resources.maxFragmentUniformVectors = 16;
312-
Resources.maxVertexOutputVectors = 16;
313-
Resources.maxFragmentInputVectors = 15;
314-
Resources.minProgramTexelOffset = -8;
315-
Resources.maxProgramTexelOffset = 7;
316-
Resources.maxClipDistances = 8;
317-
Resources.maxComputeWorkGroupCountX = 65535;
318-
Resources.maxComputeWorkGroupCountY = 65535;
319-
Resources.maxComputeWorkGroupCountZ = 65535;
320-
Resources.maxComputeWorkGroupSizeX = 1024;
321-
Resources.maxComputeWorkGroupSizeY = 1024;
322-
Resources.maxComputeWorkGroupSizeZ = 64;
323-
Resources.maxComputeUniformComponents = 1024;
324-
Resources.maxComputeTextureImageUnits = 16;
325-
Resources.maxComputeImageUniforms = 8;
326-
Resources.maxComputeAtomicCounters = 8;
327-
Resources.maxComputeAtomicCounterBuffers = 1;
328-
Resources.maxVaryingComponents = 60;
329-
Resources.maxVertexOutputComponents = 64;
330-
Resources.maxGeometryInputComponents = 64;
331-
Resources.maxGeometryOutputComponents = 128;
332-
Resources.maxFragmentInputComponents = 128;
333-
Resources.maxImageUnits = 8;
334-
Resources.maxCombinedImageUnitsAndFragmentOutputs = 8;
335-
Resources.maxCombinedShaderOutputResources = 8;
336-
Resources.maxImageSamples = 0;
337-
Resources.maxVertexImageUniforms = 0;
338-
Resources.maxTessControlImageUniforms = 0;
339-
Resources.maxTessEvaluationImageUniforms = 0;
340-
Resources.maxGeometryImageUniforms = 0;
341-
Resources.maxFragmentImageUniforms = 8;
342-
Resources.maxCombinedImageUniforms = 8;
343-
Resources.maxGeometryTextureImageUnits = 16;
344-
Resources.maxGeometryOutputVertices = 256;
345-
Resources.maxGeometryTotalOutputComponents = 1024;
346-
Resources.maxGeometryUniformComponents = 1024;
347-
Resources.maxGeometryVaryingComponents = 64;
348-
Resources.maxTessControlInputComponents = 128;
349-
Resources.maxTessControlOutputComponents = 128;
350-
Resources.maxTessControlTextureImageUnits = 16;
351-
Resources.maxTessControlUniformComponents = 1024;
352-
Resources.maxTessControlTotalOutputComponents = 4096;
353-
Resources.maxTessEvaluationInputComponents = 128;
354-
Resources.maxTessEvaluationOutputComponents = 128;
355-
Resources.maxTessEvaluationTextureImageUnits = 16;
356-
Resources.maxTessEvaluationUniformComponents = 1024;
357-
Resources.maxTessPatchComponents = 120;
358-
Resources.maxPatchVertices = 32;
359-
Resources.maxTessGenLevel = 64;
360-
Resources.maxViewports = 16;
361-
Resources.maxVertexAtomicCounters = 0;
362-
Resources.maxTessControlAtomicCounters = 0;
363-
Resources.maxTessEvaluationAtomicCounters = 0;
364-
Resources.maxGeometryAtomicCounters = 0;
365-
Resources.maxFragmentAtomicCounters = 8;
366-
Resources.maxCombinedAtomicCounters = 8;
367-
Resources.maxAtomicCounterBindings = 1;
368-
Resources.maxVertexAtomicCounterBuffers = 0;
369-
Resources.maxTessControlAtomicCounterBuffers = 0;
370-
Resources.maxTessEvaluationAtomicCounterBuffers = 0;
371-
Resources.maxGeometryAtomicCounterBuffers = 0;
372-
Resources.maxFragmentAtomicCounterBuffers = 1;
373-
Resources.maxCombinedAtomicCounterBuffers = 1;
374-
Resources.maxAtomicCounterBufferSize = 16384;
375-
Resources.maxTransformFeedbackBuffers = 4;
376-
Resources.maxTransformFeedbackInterleavedComponents = 64;
377-
Resources.maxCullDistances = 8;
378-
Resources.maxCombinedClipAndCullDistances = 8;
379-
Resources.maxSamples = 4;
380-
Resources.limits.nonInductiveForLoops = 1;
381-
Resources.limits.whileLoops = 1;
382-
Resources.limits.doWhileLoops = 1;
383-
Resources.limits.generalUniformIndexing = 1;
384-
Resources.limits.generalAttributeMatrixVectorIndexing = 1;
385-
Resources.limits.generalVaryingIndexing = 1;
386-
Resources.limits.generalSamplerIndexing = 1;
387-
Resources.limits.generalVariableIndexing = 1;
388-
Resources.limits.generalConstantMatrixVectorIndexing = 1;
389-
}
390-
391-
392292
void CHW::UpdateViews()
393293
{
394294
// Create the program pipeline used for rendering with shaders

src/Layers/xrRenderPC_GL/stdafx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <gl/GLU.h>
1515
#include <gl/glext.h>
1616
#include <gl/wglext.h>
17-
#include <ShaderLang.h>
1817

1918
#include "Layers/xrRender/xrD3DDefs.h"
2019
#include "Layers/xrRender/Debug/dxPixEventWrapper.h"

0 commit comments

Comments
 (0)