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

Changes needed for dEQP integration #46

Merged
merged 11 commits into from
May 19, 2021
Merged

Changes needed for dEQP integration #46

merged 11 commits into from
May 19, 2021

Conversation

asuonpaa
Copy link
Contributor

These changes allow to skip everything else but the shadertrap library. OpenGL wrapper header is used in place of gl32.h when compiling for dEQP.

@google-cla google-cla bot added the cla: yes label May 12, 2021
Copy link
Collaborator

@paulthomson paulthomson left a comment

Choose a reason for hiding this comment

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

Looks good to me! Left a few comments, some of which don't necessarily need addressing now.

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Collaborator

@paulthomson paulthomson left a comment

Choose a reason for hiding this comment

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

One more comment. Regarding the CI failure, this looks like cppcheck is suddenly failing to compile. I assume this is because cppcheck was incorrectly not including a header somewhere and the system's C++ headers have now changed, exposing the bug. We could try updating cppcheck and/or we could make the cppcheck build always use clang's libc++ (which we download explicitly).

CMakeLists.txt Outdated Show resolved Hide resolved
@paulthomson
Copy link
Collaborator

One more comment. Regarding the CI failure, this looks like cppcheck is suddenly failing to compile. I assume this is because cppcheck was incorrectly not including a header somewhere and the system's C++ headers have now changed, exposing the bug. We could try updating cppcheck and/or we could make the cppcheck build always use clang's libc++ (which we download explicitly).

@afd

src/libshadertrap/CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@afd
Copy link
Contributor

afd commented May 18, 2021

If you rebase, main now incorporates a temporary workaround for the cppcheck build problem.

@afd afd merged commit dfa8e62 into google:main May 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants