zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small cleanup in i_video.mm

Browse source
This commit is contained in:
alexey.lysiuk 2014-12-29 18:03:36 +02:00
parent 5c88364300
commit 68dbd56eab
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/posix/cocoa/i_video.mm
View file

@ -38,7 +38,6 @@
#import <AppKit/NSOpenGLView.h> #import <AppKit/NSOpenGLView.h>
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
#import <OpenGL/gl.h> #import <OpenGL/gl.h>
#import <OpenGL/OpenGL.h>
// Avoid collision between DObject class and Objective-C // Avoid collision between DObject class and Objective-C
#define Class ObjectClass #define Class ObjectClass
@ -690,7 +689,7 @@ void CocoaVideo::SetMode(const int width, const int height, const bool fullscree
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
CGLFlushDrawable(CGLGetCurrentContext()); [[NSOpenGLContext currentContext] flushBuffer];
static NSString* const TITLE_STRING = static NSString* const TITLE_STRING =
[NSString stringWithFormat:@"%s %s", GAMESIG, GetVersionString()]; [NSString stringWithFormat:@"%s %s", GAMESIG, GetVersionString()];
@ -943,7 +942,7 @@ void CocoaFrameBuffer::Flip()
#endif // __LITTLE_ENDIAN__ #endif // __LITTLE_ENDIAN__
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
Width, Height, 0, format, GL_UNSIGNED_BYTE, m_pixelBuffer); Width, Height, 0, format, GL_UNSIGNED_BYTE, m_pixelBuffer);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glColor4f(1.0f, 1.0f, 1.0f, 1.0f);