Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes for eglMakeCurrent. #1163

Merged
merged 6 commits into from
Oct 6, 2017
Merged

Conversation

ben-clayton
Copy link
Contributor

No description provided.

gapii/cc/spy.cpp Outdated
@@ -372,10 +368,6 @@ std::shared_ptr<StaticContextState> GlesSpy::GetEGLStaticContextState(CallObserv
}

std::shared_ptr<DynamicContextState> GlesSpy::GetEGLDynamicContextState(CallObserver* observer, EGLDisplay display, EGLSurface draw, EGLContext context) {
if (draw == nullptr) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally add a comment saying 'draw' may be null, otherwise it will be forgotten in couple of months?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just removed the unused parameters instead.

Copy link
Contributor Author

@ben-clayton ben-clayton Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Humm... except they were used. Bugger.
One for tomorrow (today), I think.

from GetEGLStaticContextState. It’s not used.
Copy link
Contributor

@dsrbecky dsrbecky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

if (mPBuf == nullptr) {
GAPID_FATAL("wglCreatePbufferARB failed. Error: 0x%x", GetLastError());
GAPID_FATAL("wglCreatePbufferARB(%p, %d, %d, %d, %p) failed. Error: 0x%x",
mHDC, format, safe_width, safe_height, create_attribs, GetLastError());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/mHDC/wgl.mHDC/ ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot. Done

@ben-clayton ben-clayton merged commit 1ce4818 into google:master Oct 6, 2017
@ben-clayton ben-clayton deleted the filament branch October 6, 2017 13:42
purvisa-at-google-com pushed a commit that referenced this pull request Sep 29, 2022
Visualize GPU frequencies from different counters with a shared maximum range value.
Add hs_err_pid* log java runtime files to the ignore list;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants