epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Texture.GetData under GLES.

Browse Source
This commit is contained in:
Paul Chote
2020-01-06 23:00:21 +00:00
committed by abcdefg30
parent 524e8875d0
commit d622015b59
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Platforms.Default/OpenGL.cs
View File

@@ -31,7 +31,8 @@ namespace OpenRA.Platforms.Default
None = 0, None = 0,
Core = 1, Core = 1,
GLES = 2, GLES = 2,
DebugMessagesCallback = 4 DebugMessagesCallback = 4,
ESReadFormatBGRA = 8
} }
public static GLFeatures Features { get; private set; } public static GLFeatures Features { get; private set; }
@@ -122,6 +123,7 @@ namespace OpenRA.Platforms.Default
// OpenGL 1.1 - 1.5 // OpenGL 1.1 - 1.5
public const int GL_CLIENT_PIXEL_STORE_BIT = 0x0001; public const int GL_CLIENT_PIXEL_STORE_BIT = 0x0001;
public const int GL_RGBA = 0x1908;
public const int GL_BGRA = 0x80E1; public const int GL_BGRA = 0x80E1;
public const int GL_RGBA8 = 0x8058; public const int GL_RGBA8 = 0x8058;
public const int GL_CLAMP_TO_EDGE = 0x812F; public const int GL_CLAMP_TO_EDGE = 0x812F;
@@ -625,7 +627,12 @@ namespace OpenRA.Platforms.Default
// Core features are defined as the shared feature set of GL 3.2 and (GLES 3 + BGRA extension) // Core features are defined as the shared feature set of GL 3.2 and (GLES 3 + BGRA extension)
var hasBGRA = SDL.SDL_GL_ExtensionSupported("GL_EXT_texture_format_BGRA8888") == SDL.SDL_bool.SDL_TRUE; var hasBGRA = SDL.SDL_GL_ExtensionSupported("GL_EXT_texture_format_BGRA8888") == SDL.SDL_bool.SDL_TRUE;
if (Version.Contains(" ES") && hasBGRA && major >= 3) if (Version.Contains(" ES") && hasBGRA && major >= 3)
{
Features = GLFeatures.Core | GLFeatures.GLES; Features = GLFeatures.Core | GLFeatures.GLES;
if (SDL.SDL_GL_ExtensionSupported("GL_EXT_read_format_bgra") == SDL.SDL_bool.SDL_TRUE)
Features |= GLFeatures.ESReadFormatBGRA;
}
else if (major > 3 || (major == 3 && minor >= 2)) else if (major > 3 || (major == 3 && minor >= 2))
Features = GLFeatures.Core; Features = GLFeatures.Core;

19
OpenRA.Platforms.Default/Texture.cs
View File

@@ -133,16 +133,31 @@ namespace OpenRA.Platforms.Default
OpenGL.glFramebufferTexture2D(OpenGL.GL_FRAMEBUFFER, OpenGL.GL_COLOR_ATTACHMENT0, OpenGL.GL_TEXTURE_2D, texture, 0); OpenGL.glFramebufferTexture2D(OpenGL.GL_FRAMEBUFFER, OpenGL.GL_COLOR_ATTACHMENT0, OpenGL.GL_TEXTURE_2D, texture, 0);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
var canReadBGRA = OpenGL.Features.HasFlag(OpenGL.GLFeatures.ESReadFormatBGRA);
unsafe unsafe
{ {
fixed (byte* ptr = &data[0]) fixed (byte* ptr = &data[0])
{ {
var intPtr = new IntPtr((void*)ptr); var intPtr = new IntPtr(ptr);
OpenGL.glReadPixels(0, 0, Size.Width, Size.Height, OpenGL.GL_BGRA, OpenGL.GL_UNSIGNED_BYTE, intPtr);
var format = canReadBGRA ? OpenGL.GL_BGRA : OpenGL.GL_RGBA;
OpenGL.glReadPixels(0, 0, Size.Width, Size.Height, format, OpenGL.GL_UNSIGNED_BYTE, intPtr);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
} }
} }
// Convert RGBA to BGRA
if (!canReadBGRA)
{
for (var i = 0; i < 4 * Size.Width * Size.Height; i += 4)
{
var temp = data[i];
data[i] = data[i + 2];
data[i + 2] = temp;
}
}
OpenGL.glBindFramebuffer(OpenGL.GL_FRAMEBUFFER, (uint)lastFramebuffer); OpenGL.glBindFramebuffer(OpenGL.GL_FRAMEBUFFER, (uint)lastFramebuffer);
OpenGL.glDeleteFramebuffers(1, ref framebuffer); OpenGL.glDeleteFramebuffers(1, ref framebuffer);
OpenGL.CheckGLError(); OpenGL.CheckGLError();