Skip to content

Fix Garch opengl check, add ARC conditionals to HgiMetal. #2

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

Merged
dgovil merged 1 commit into from
Sep 9, 2024
Merged

Fix Garch opengl check, add ARC conditionals to HgiMetal. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pxr/imaging/garch/glPlatformContextDarwin.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "pxr/pxr.h"
#include "glPlatformContextDarwin.h"

#if defined(PXR_OPENGL_SUPPORT_ENABLED)
#if defined(PXR_GL_SUPPORT_ENABLED)
#ifdef ARCH_OS_OSX
#import <AppKit/NSOpenGL.h>
typedef NSOpenGLContext NSGLContext;
Expand All @@ -27,7 +27,7 @@
{
public:
Detail() {
#if defined(PXR_OPENGL_SUPPORT_ENABLED)
#if defined(PXR_GL_SUPPORT_ENABLED)
context = [NSGLContext currentContext];
#else
context = nil;
Expand Down Expand Up @@ -82,7 +82,7 @@
void
GarchNSGLContextState::MakeCurrent()
{
#if defined(PXR_OPENGL_SUPPORT_ENABLED)
#if defined(PXR_GL_SUPPORT_ENABLED)
#if defined(ARCH_OS_IPHONE)
[EAGLContext setCurrentContext:_detail->context];
#else
Expand All @@ -95,7 +95,7 @@
void
GarchNSGLContextState::DoneCurrent()
{
#if defined(PXR_OPENGL_SUPPORT_ENABLED)
#if defined(PXR_GL_SUPPORT_ENABLED)
#if defined(ARCH_OS_IPHONE)
[EAGLContext setCurrentContext:nil];
#else
Expand Down
2 changes: 2 additions & 0 deletions pxr/imaging/hgiMetal/blitCmds.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@
memcpy(dst + dstOffset, src, copyOp.byteSize);
}

#if defined(ARCH_OS_OSX)
if (!sharedBuffer &&
[metalBuffer->GetBufferId()
respondsToSelector:@selector(didModifyRange:)]) {
Expand All @@ -364,6 +365,7 @@
[resource didModifyRange:range];
ARCH_PRAGMA_POP
}
#endif // defined(ARCH_OS_OSX)
}

void
Expand Down
2 changes: 2 additions & 0 deletions pxr/imaging/hgiMetal/indirectCommandEncoder.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@
}

HgiMetalIndirectCommandEncoder::~HgiMetalIndirectCommandEncoder() {
#if !__has_feature(objc_arc)
[_triangleTessFactors release];
[_quadTessFactors release];
#endif // !__has_feature(objc_arc)
}

std::string
Expand Down
⚡