942500 - Move GLContext::TexImage2D and friends out of GLContext

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Benoit Jacob [:bjacob] (mostly away)]

GLContext::TexImage2D is our own helper to upload textures more easily, not to be confused with GLContext::fTexImage2D which is the actual OpenGL entry point. I think that the name similarity alone is a problem; and that is a significant amount of nontrivial code that we could free GLContext.* of.

Comment 1

[Benoit Jacob [:bjacob] (mostly away)]

In the process of doing that, we'd also move CopyAndPadTextureData out of GLContext.cpp, as it's only used by TexImage2D.

Comment 2

[Benoit Jacob [:bjacob] (mostly away)]

TexImage2D has friends which should move along with it:

    void TexImage2D(GLenum target, GLint level, GLint internalformat,
                    GLsizei width, GLsizei height, GLsizei stride,
                    GLint pixelsize, GLint border, GLenum format,
                    GLenum type, const GLvoid *pixels);

    void TexSubImage2D(GLenum target, GLint level,
                       GLint xoffset, GLint yoffset,
                       GLsizei width, GLsizei height, GLsizei stride,
                       GLint pixelsize, GLenum format,
                       GLenum type, const GLvoid* pixels);

    /**
     * Uses the Khronos GL_EXT_unpack_subimage extension, working around
     * quirks in the Tegra implementation of this extension.
     */
    void TexSubImage2DWithUnpackSubimageGLES(GLenum target, GLint level,
                                             GLint xoffset, GLint yoffset,
                                             GLsizei width, GLsizei height,
                                             GLsizei stride, GLint pixelsize,
                                             GLenum format, GLenum type,
                                             const GLvoid* pixels);

    void TexSubImage2DWithoutUnpackSubimage(GLenum target, GLint level,
                                            GLint xoffset, GLint yoffset,
                                            GLsizei width, GLsizei height,
                                            GLsizei stride, GLint pixelsize,
                                            GLenum format, GLenum type,
                                            const GLvoid* pixels);

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

I'll do this one next.

Comment 4

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Move GLContext::TexImage2D and friends to be static functions in GLUploadHelpers.cpp

It turns out that these functions were only used (anymore?) in the Upload* functions that just moved there!

Comment 5

[Benoit Jacob [:bjacob] (mostly away)]

https://tbpl.mozilla.org/?tree=Try&rev=1b48093b8244

Comment 6

[Benoit Jacob [:bjacob] (mostly away)]

https://tbpl.mozilla.org/?tree=Try&rev=01672e3e55a0

http://hg.mozilla.org/integration/mozilla-inbound/rev/11d9777debba

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/11d9777debba