942507 - GLContext doesn't need to have userdata

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

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

This part of GLContext.h:

    void *GetUserData(void *aKey) {
        void *result = nullptr;
        mUserData.Get(aKey, &result);
        return result;
    }

    void SetUserData(void *aKey, void *aValue) {
        mUserData.Put(aKey, aValue);
    }

It currently seems to be used in only one place deep inside gfx/layers.

Comment 1

[u480271]

Attachment: GLContext doesn't need to have userdata.

SetUserData/GetUserData was used in one place; in debug builds of
OGLShaderProgram for tracking the current program. But this relied on someone
not doing:

    aShaderProgram->Activate();
    ...
    aGL->fUseProgram(...);
    ...
    aShaderProgram->SetUniform(...);

Since this is only used in debug, I removed user data from GLContext and
replaced the usage in OGLShaderProgram with a call to
aGL->GetUIntegerv(LOCAL_GL_CURRENT_PROGRAM) and compare the result to mProgram.
This is more accurate but potentially slower but since this is only in debug
build, which is already slow, I didn't think it would be an issue.

Comment 2

[u480271]

https://tbpl.mozilla.org/?tree=Try&rev=6ca65fb64b17

Comment 3

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

Comment on attachment 8342829 [details] [diff] [review]
GLContext doesn't need to have userdata.

Review of attachment 8342829 [details] [diff] [review]:
-----------------------------------------------------------------

r=me, but it looks like this is leaving behind sCurrentProgramKey which is now unused, and thus should be removed, right?

Comment 4

[u480271]

Attachment: GLContext doesn't need to have userdata

Removed unused sCurrentProgramKey.

Carry r+=bjacob

Comment 5

[u480271]

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

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/013d080dbc29

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/013d080dbc29