Remove the link-time requirement on libX11 and libGL. #1658
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is only on Linux. Now gapid can be built/run without libX11 being present on the trace/replay device if it is not required.
ben-clayton
approved these changes
Feb 28, 2018
core/os/device/deviceinfo/cc/gl.cpp
Outdated
| @@ -42,23 +45,18 @@ void glDriver(device::OpenGLDriver* driver) { | |||
| auto glGetString = reinterpret_cast<PFNGLGETSTRING>(core::GetGlesProcAddress("glGetString", true)); | |||
| auto glGetStringi = reinterpret_cast<PFNGLGETSTRINGI>(core::GetGlesProcAddress("glGetStringi", true)); | |||
|
|
|||
| GAPID_ASSERT(glGetError != nullptr); | |||
There was a problem hiding this comment.
Please can we keep the asserts?
| } | ||
|
|
||
| core::DlLoader libX("libX11.so"); | ||
| pfn_XFree free = (pfn_XFree)libX.lookup("XFree"); |
There was a problem hiding this comment.
Please can we be consistent with the function variable names? I don't care if you want to rename fn_glXDestroyPbuffer and fn_glXDestroyContext, but they should probably match style.
| } | ||
|
|
||
| if (gContext.mDisplay == nullptr) { |
ben-clayton
approved these changes
Feb 28, 2018
ben-clayton
added a commit
to ben-clayton/gapid
that referenced
this pull request
Mar 1, 2018
Taking the changes in google#1658 further still.
ben-clayton
added a commit
to ben-clayton/gapid
that referenced
this pull request
Mar 1, 2018
Taking the changes in google#1658 further still.
ben-clayton
added a commit
to ben-clayton/gapid
that referenced
this pull request
Mar 1, 2018
Taking the changes in google#1658 further still.
ben-clayton
added a commit
that referenced
this pull request
Mar 1, 2018
Taking the changes in #1658 further still.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is only on Linux. Now gapid can be built/run without
libX11 being present on the trace/replay device if it is
not required.