forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #629 texture2D is deprecated, change to texture

This commit is contained in:
Grim Maple 2022-10-25 18:22:57 +03:00
parent dc3c083a42
commit af36d0d76c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -231,6 +231,7 @@ class SDLWindow : Window {
Log.i("Trying to create OpenGL ", versionMajor, ".", versionMinor, " context"); Log.i("Trying to create OpenGL ", versionMajor, ".", versionMinor, " context");
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, versionMajor); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, versionMajor);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, versionMinor); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, versionMinor);
// SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, _platform.instance.getMultisamples());
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
_context = SDL_GL_CreateContext(_win); // Create the actual context and make it current _context = SDL_GL_CreateContext(_win); // Create the actual context and make it current
if (!_context) if (!_context)

2
views/res/shaders/colored.frag
View File

@ -130,7 +130,7 @@ void main()
#endif #endif
#if defined(LIGHTMAP) #if defined(LIGHTMAP)
vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1); vec4 lightColor = texture(u_lightmapTexture, v_texCoord1);
_fragColor.rgb *= lightColor.rgb; _fragColor.rgb *= lightColor.rgb;
#endif #endif

2
views/res/shaders/lighting.frag
View File

@ -30,7 +30,7 @@ vec3 getLitPixel()
{ {
#if defined(BUMPED) #if defined(BUMPED)
vec3 normalVector = normalize(texture2D(u_normalmapTexture, v_texCoord).rgb * 2.0 - 1.0); vec3 normalVector = normalize(texture(u_normalmapTexture, v_texCoord).rgb * 2.0 - 1.0);
#else #else

4
views/res/shaders/textured.frag
View File

@ -133,7 +133,7 @@ void main()
if(v_clipDistance < 0.0) discard; if(v_clipDistance < 0.0) discard;
#endif #endif
_baseColor = texture2D(u_diffuseTexture, v_texCoord); _baseColor = texture(u_diffuseTexture, v_texCoord);
#if defined(FOG) #if defined(FOG)
float dist = 0.0; float dist = 0.0;
@ -161,7 +161,7 @@ void main()
#endif #endif
#if defined(LIGHTMAP) #if defined(LIGHTMAP)
vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1); vec4 lightColor = texture(u_lightmapTexture, v_texCoord1);
_fragColor.rgb *= lightColor.rgb; _fragColor.rgb *= lightColor.rgb;
#endif #endif