Skip to content

Commit

Permalink
Revert backport of 254551@main, breaks the WPE build
Browse files Browse the repository at this point in the history
This reverts commit e0f37a4 (Merge 254551@main - Unreviewed, build fix error after 254207@main https://bugs.webkit.org/show_bug.cgi?id=245268, 2022-09-16).
  • Loading branch information
aperezdc committed Sep 25, 2022
1 parent 55ef877 commit 9980be9
Showing 1 changed file with 6 additions and 6 deletions.
Expand Up @@ -58,7 +58,7 @@ void GraphicsContextGLOpenGL::readnPixels(GCGLint x, GCGLint y, GCGLsizei width,
::glFlush();
}

::glReadPixels(x, y, width, height, format, type, data.data());
::glReadPixels(x, y, width, height, format, type, data.data);

if (attributes.antialias && m_state.boundDrawFBO == m_multisampleFBO)
::glBindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
Expand Down Expand Up @@ -214,28 +214,28 @@ void GraphicsContextGLOpenGL::getIntegerv(GCGLenum pname, GCGLSpan<GCGLint> valu
if (!makeContextCurrent())
return;

::glGetIntegerv(pname, value.data());
::glGetIntegerv(pname, value.data);
}

void GraphicsContextGLOpenGL::getShaderPrecisionFormat(GCGLenum shaderType, GCGLenum precisionType, GCGLSpan<GCGLint, 2> range, GCGLint* precision)
{
ASSERT(range.data());
ASSERT(range.data);
ASSERT(precision);

if (!makeContextCurrent())
return;

::glGetShaderPrecisionFormat(shaderType, precisionType, range.data(), precision);
::glGetShaderPrecisionFormat(shaderType, precisionType, range.data, precision);
}

void GraphicsContextGLOpenGL::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, GCGLSpan<const GCGLvoid> pixels)
{
if (width && height && !pixels.data()) {
if (width && height && !pixels.data) {
synthesizeGLError(INVALID_VALUE);
return;
}

texImage2DDirect(target, level, internalformat, width, height, border, format, type, pixels.data());
texImage2DDirect(target, level, internalformat, width, height, border, format, type, pixels.data);
}

void GraphicsContextGLOpenGL::validateAttributes()
Expand Down

0 comments on commit 9980be9

Please sign in to comment.