Skip to content

Commit 0fbea61

Browse files
committed
Revert "Reapply "make all extensions optional""
This reverts commit 8285cf7.
1 parent 7172dab commit 0fbea61

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

jme3-core/src/main/resources/Common/MatDefs/ShaderNodes/Environment/envMapping100.frag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#extension GL_ARB_shader_texture_lod : warn
2-
#extension GL_EXT_shader_texture_lod : warn
1+
#extension GL_ARB_shader_texture_lod : enable
2+
#extension GL_EXT_shader_texture_lod : enable
33
void main(){
44
//@input vec3 refVec the reflection vector
55
//@input samplerCube cubeMap the cube map

jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#extension GL_ARB_texture_multisample : warn
2-
#extension GL_EXT_multisampled_render_to_texture : warn
1+
#extension GL_ARB_texture_multisample : enable
2+
#extension GL_EXT_multisampled_render_to_texture : enable
33

44
uniform int m_NumSamples;
55
uniform int m_NumSamplesDepth;

jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#extension GL_ARB_shader_texture_lod : warn
1+
#extension GL_ARB_shader_texture_lod : enable
22
#ifndef PI
33
#define PI 3.14159265358979323846264
44
#endif

jme3-core/src/main/resources/Common/ShaderLib/Shadows.glsllib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// gather functions are declared to work on shadow maps
44
// This "if" statement is useless as jme3 changes line ordering, so all extensions are tried to be loaded
55
#ifdef GL_ES
6-
#extension GL_OES_gpu_shader5 : warn
6+
#extension GL_OES_gpu_shader5 : enable
77
#else
8-
#extension GL_ARB_gpu_shader5 : warn
8+
#extension GL_ARB_gpu_shader5 : enable
99
#endif
1010

1111
#define IVEC2 ivec2

jme3-core/src/main/resources/Common/ShaderLib/Ubo.glsllib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#ifdef ENABLE_UBO
44
// #version 140
5-
#extension GL_ARB_uniform_buffer_object : warn
5+
#extension GL_ARB_uniform_buffer_object : enable
66

77
#define START_MATPARAMS layout(std140) uniform matparams {
88
#define END_MATPARAMS }

jme3-effects/src/main/resources/Common/MatDefs/Post/FXAA.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "Common/ShaderLib/GLSLCompat.glsllib"
2-
#extension GL_EXT_gpu_shader4 : warn
2+
#extension GL_EXT_gpu_shader4 : enable
33

44
uniform sampler2D m_Texture;
55
uniform vec2 g_ResolutionInverse;

jme3-examples/src/main/resources/jme3test/texture/UnshadedArray.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "Common/ShaderLib/GLSLCompat.glsllib"
22

3-
#extension GL_EXT_texture_array : warn
3+
#extension GL_EXT_texture_array : enable
44
// #extension GL_EXT_gpu_shader4 : enable
55

66
uniform vec4 m_Color;

jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#extension GL_EXT_texture_array : warn
1+
#extension GL_EXT_texture_array : enable
22
#import "Common/ShaderLib/GLSLCompat.glsllib"
33

44
#define ENABLE_PBRLightingUtils_getWorldPosition 1

0 commit comments

Comments
 (0)