942509 - Move Upload* helpers out of GLContext

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

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

This part of GLContext.h:

    SurfaceFormat UploadImageDataToTexture(unsigned char* aData,
                                           int32_t aStride,
                                           gfxImageFormat aFormat,
                                           const nsIntRegion& aDstRegion,
                                           GLuint& aTexture,
                                           bool aOverwrite = false,
                                           bool aPixelBuffer = false,
                                           GLenum aTextureUnit = LOCAL_GL_TEXTURE0,
                                           GLenum aTextureTarget = LOCAL_GL_TEXTURE_2D);

    /**
     * Convenience wrapper around UploadImageDataToTexture for gfxASurfaces. 
     */
    SurfaceFormat UploadSurfaceToTexture(gfxASurface *aSurface,
                                         const nsIntRegion& aDstRegion,
                                         GLuint& aTexture,
                                         bool aOverwrite = false,
                                         const nsIntPoint& aSrcPoint = nsIntPoint(0, 0),
                                         bool aPixelBuffer = false,
                                         GLenum aTextureUnit = LOCAL_GL_TEXTURE0,
                                         GLenum aTextureTarget = LOCAL_GL_TEXTURE_2D);

    /**
     * Same as above, for DataSourceSurfaces.
     */
    SurfaceFormat UploadSurfaceToTexture(gfx::DataSourceSurface *aSurface,
                                         const nsIntRegion& aDstRegion,
                                         GLuint& aTexture,
                                         bool aOverwrite = false,
                                         const nsIntPoint& aSrcPoint = nsIntPoint(0, 0),
                                         bool aPixelBuffer = false,
                                         GLenum aTextureUnit = LOCAL_GL_TEXTURE0,
                                         GLenum aTextureTarget = LOCAL_GL_TEXTURE_2D);

Comment 1

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

Attachment: Move Upload* functions to new GLUploadHelpers files

These new files will also receive more code: the TexImage2D() functions and friends, and the CanUpload*() getters.

Comment 2

[Andreas Gal :gal]

Comment on attachment 8340773 [details] [diff] [review]
Move Upload* functions to new GLUploadHelpers files

Looks like straight up code movement so I will steal this one if Jeff doesn't mind.

Comment 3

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

This one is indeed quite straightforward. The only question which I'd expect to be raised is how much file proliferation we want to allow; this is what I tried to justify in comment 1 with 

> These new files will also receive more code: the TexImage2D() functions and friends, and the CanUpload*() getters.

So that while this patch introduces more files, it will allow future patches not to.

Comment 4

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

https://tbpl.mozilla.org/?tree=Try&rev=81c4c0638a07

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/3f08f279aec7

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/3f08f279aec7