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.

Sign up for GitHub

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

Jump to bottom

Fix SpoutGL.cpp for VS2022 C++20 #80

Merged
merged 1 commit into from
Jan 22, 2022
Merged

Fix SpoutGL.cpp for VS2022 C++20 #80

merged 1 commit into from
Jan 22, 2022

Conversation

lesha198a
Copy link
Contributor

Due to "Error on ordered pointer comparison against nullptr or 0":

FAILED: SPOUTSDK/SpoutGL/CMakeFiles/Spout_static.dir/SpoutGL.cpp.obj 
D:\projects\Spout2\SPOUTSDK\SpoutGL\SpoutGL.cpp(393): error C7664: '>': ordered comparison of pointer and integer zero ('ID3D11Device *' and 'int')
D:\projects\Spout2\SPOUTSDK\SpoutGL\SpoutGL.cpp(394): error C7664: '>': ordered comparison of pointer and integer zero ('HANDLE' and 'int')

@lesha198a lesha198a changed the title Fix SpoutGL.cpp for VC2022 C++20 Fix SpoutGL.cpp for VS2022 C++20 Jan 21, 2022
@leadedge leadedge merged commit 40a8ec8 into leadedge:master Jan 22, 2022
@leadedge
Copy link
Owner

OK, thanks.
It looks like VS2017 has not been updated for this.
I will go through everything to check for similar occurrences.

leadedge added a commit that referenced this pull request Feb 24, 2022
@leadedge
Accumulated changes - beta branch
fea2bf5 
Spout.cpp
    - Restore GetSenderAdpater for testing
SpoutCopy.cpp
    - use std:: prefix for floor in rgba2rgbResample for Clang compatibility. PR#81
SpoutDirectX.cpp
    - Correct log notice in ReleaseDX11Texture to show texture instead of device
    - Move adapter pointer release from release device to destructor
SpoutFrameCount.cpp
    - Clean up logs in CreateAccessMutex and EnableFrameCount
    - Change "_uuidof" to "__uuidof" in CheckKeyedAccess. PR#81
SpoutGL.cpp
    - Add "No error: case comment to LinkGLDXtextures
    - Remove un-necessary wglDXSetResourceShareHandle from LinkGLDXtextures
    - Create m_bGLDXdone flag for GLDXready to avoid repeats
    - Change pointer comparision from >0 to nullptr in OpenSpout (PR #80)
    - Remove m_hInteropDevice created check in OpenSpout
    - Clean up logs in LoadGLextensions
    - Restore glBufferData method for in UnloadTexturePixels
      pending implementation of glFencSync for glMapBufferRange method
SpoutUtils.cpp
    - Change return logic of RemovePathFromRegistry
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lesha198a @leadedge