Skip to content

A
angle
Commit c4f889fb by James Darpinian Committed by Commit Bot
Options

Fix format/internalformat confusion

Bug: angleproject:4084 Change-Id: I24a184b78bef2994a3045b141ecd72a49d66cfdf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1934890Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: James Darpinian <jdarpinian@chromium.org>
parent 232d009d
Showing with 8 additions and 8 deletions
src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp
...@@ -50,8 +50,8 @@ static const IOSurfaceFormatInfo kIOSurfaceFormats[] = { ...@@ -50,8 +50,8 @@ static const IOSurfaceFormatInfo kIOSurfaceFormats[] = {
{GL_RED, GL_UNSIGNED_BYTE, 1, GL_RED, GL_RED, GL_UNSIGNED_BYTE }, {GL_RED, GL_UNSIGNED_BYTE, 1, GL_RED, GL_RED, GL_UNSIGNED_BYTE },
{GL_R16UI, GL_UNSIGNED_SHORT, 2, GL_RED, GL_RED, GL_UNSIGNED_SHORT }, {GL_R16UI, GL_UNSIGNED_SHORT, 2, GL_RED, GL_RED, GL_UNSIGNED_SHORT },
{GL_RG, GL_UNSIGNED_BYTE, 2, GL_RG, GL_RG, GL_UNSIGNED_BYTE }, {GL_RG, GL_UNSIGNED_BYTE, 2, GL_RG, GL_RG, GL_UNSIGNED_BYTE },
{GL_RGB, GL_UNSIGNED_BYTE, 4, GL_BGRA, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}, {GL_RGB, GL_UNSIGNED_BYTE, 4, GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
{GL_BGRA_EXT, GL_UNSIGNED_BYTE, 4, GL_BGRA, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}, {GL_BGRA_EXT, GL_UNSIGNED_BYTE, 4, GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
{GL_RGBA, GL_HALF_FLOAT, 8, GL_RGBA, GL_RGBA, GL_HALF_FLOAT }, {GL_RGBA, GL_HALF_FLOAT, 8, GL_RGBA, GL_RGBA, GL_HALF_FLOAT },
}; };
// clang-format on // clang-format on
...@@ -159,9 +159,9 @@ egl::Error IOSurfaceSurfaceCGL::bindTexImage(const gl::Context *context, ...@@ -159,9 +159,9 @@ egl::Error IOSurfaceSurfaceCGL::bindTexImage(const gl::Context *context,
stateManager->bindTexture(gl::TextureType::Rectangle, textureID); stateManager->bindTexture(gl::TextureType::Rectangle, textureID);
const auto &format = kIOSurfaceFormats[mFormatIndex]; const auto &format = kIOSurfaceFormats[mFormatIndex];
CGLError error = CGLTexImageIOSurface2D(mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeFormat, CGLError error = CGLTexImageIOSurface2D(
mWidth, mHeight, format.nativeInternalFormat, mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeInternalFormat, mWidth, mHeight,
format.nativeType, mIOSurface, mPlane); format.nativeFormat, format.nativeType, mIOSurface, mPlane);
if (error != kCGLNoError) if (error != kCGLNoError)
{ {
...@@ -288,9 +288,9 @@ FramebufferImpl *IOSurfaceSurfaceCGL::createDefaultFramebuffer(const gl::Context ...@@ -288,9 +288,9 @@ FramebufferImpl *IOSurfaceSurfaceCGL::createDefaultFramebuffer(const gl::Context
functions->genTextures(1, &texture); functions->genTextures(1, &texture);
const auto &format = kIOSurfaceFormats[mFormatIndex]; const auto &format = kIOSurfaceFormats[mFormatIndex];
stateManager->bindTexture(gl::TextureType::Rectangle, texture); stateManager->bindTexture(gl::TextureType::Rectangle, texture);
CGLError error = CGLTexImageIOSurface2D(mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeFormat, CGLError error = CGLTexImageIOSurface2D(
mWidth, mHeight, format.nativeInternalFormat, mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeInternalFormat, mWidth, mHeight,
format.nativeType, mIOSurface, mPlane); format.nativeFormat, format.nativeType, mIOSurface, mPlane);
if (error != kCGLNoError) if (error != kCGLNoError)
{ {
ERR() << "CGLTexImageIOSurface2D failed: " << CGLErrorString(error); ERR() << "CGLTexImageIOSurface2D failed: " << CGLErrorString(error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment