[DGL] Query correct value for MaxTextureSlots (MonoGame#6970)

* Query correct value for the bounds to GL.ActiveTexture see bug MonoGame#6969 * Fix typo
kimimaru4000 · Sep 25, 2020 · 98a1c92 · 98a1c92
1 parent a53b231
commit 98a1c92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/MonoGame.Framework/Platform/Graphics/GraphicsDevice.OpenGL.cs b/MonoGame.Framework/Platform/Graphics/GraphicsDevice.OpenGL.cs
@@ -254,9 +254,7 @@ private void PlatformSetup()
 
             Context.MakeCurrent(windowInfo);
 #endif
-            MaxTextureSlots = 16;
-
-            GL.GetInteger(GetPName.MaxTextureImageUnits, out MaxTextureSlots);
+            GL.GetInteger(GetPName.MaxCombinedTextureImageUnits, out MaxTextureSlots);
             GraphicsExtensions.CheckGLError();
 
             GL.GetInteger(GetPName.MaxTextureSize, out _maxTextureSize);

diff --git a/MonoGame.Framework/Platform/Graphics/OpenGL.cs b/MonoGame.Framework/Platform/Graphics/OpenGL.cs
@@ -315,6 +315,7 @@ internal enum GetPName : int
     {
         ArrayBufferBinding = 0x8894,
         MaxTextureImageUnits = 0x8872,
+        MaxCombinedTextureImageUnits = 0x8B4D,
         MaxVertexAttribs = 0x8869,
         MaxTextureSize = 0x0D33,
         MaxDrawBuffers = 0x8824,