Changeset - r24920:a20fba25923b
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
Michael Lutz - 3 years ago 2021-02-10 23:10:27
michi@icosahedron.de
Codechange: [OSX] Add support for (un)locking the video buffer.
2 files changed with 42 insertions and 6 deletions:
src/video/cocoa/cocoa_v.h
13
2
src/video/cocoa/cocoa_v.mm
29
4
0 comments (0 inline, 0 general)
src/video/cocoa/cocoa_v.h
➞
Show inline comments
 
@@ -51,13 +51,17 @@ public:
 

			




	
	
	
		
 
	void GameLoop();

			




	
	
	
		
 

			




	
	
	
		
 
	virtual void AllocateBackingStore() = 0;

			




	
	
	
		
 
	virtual void AllocateBackingStore(bool force = false) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
	Rect dirty_rect;    ///< Region of the screen that needs redrawing.

			




	
	
	
		
 
	bool buffer_locked; ///< Video buffer was locked by the main thread.

			




	
	
	
		
 

			




	
	
	
		
 
	Dimension GetScreenSize() const override;

			




	
	
	
		
 
	float GetDPIScale() override;

			




	
	
	
		
 
	void InputLoop() override;

			




	
	
	
		
 
	bool LockVideoBuffer() override;

			




	
	
	
		
 
	void UnlockVideoBuffer() override;

			




	
	
	
		
 

			




	
	
	
		
 
	void GameSizeChanged();

			




	
	
	
		
 

			




	
	
		
 
@@ -69,6 +73,11 @@ protected:

			




	
	
	
		
 

			




	
	
	
		
 
	virtual NSView* AllocateDrawView() = 0;

			




	
	
	
		
 

			




	
	
	
		
 
	/** Get a pointer to the video buffer. */

			




	
	
	
		
 
	virtual void *GetVideoPointer() = 0;

			




	
	
	
		
 
	/** Hand video buffer back to the drawing backend. */

			




	
	
	
		
 
	virtual void ReleaseVideoPointer() {}

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
	bool PollEvent();

			




	
	
	
		
 

			




	
	
		
 
@@ -101,13 +110,15 @@ public:

			




	
	
	
		
 
	/** Return driver name */

			




	
	
	
		
 
	const char *GetName() const override { return "cocoa"; }

			




	
	
	
		
 

			




	
	
	
		
 
	void AllocateBackingStore() override;

			




	
	
	
		
 
	void AllocateBackingStore(bool force = false) override;

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
	void Paint() override;

			




	
	
	
		
 
	void CheckPaletteAnim() override;

			




	
	
	
		
 

			




	
	
	
		
 
	NSView* AllocateDrawView() override;

			




	
	
	
		
 

			




	
	
	
		
 
	void *GetVideoPointer() override { return this->buffer_depth == 8 ? this->pixel_buffer : this->window_buffer; }

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
class FVideoDriver_CocoaQuartz : public DriverFactoryBase {

			




        

    


    
    

    

        

                

                    src/video/cocoa/cocoa_v.mm
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -85,6 +85,7 @@ static const Dimension _default_resoluti

			




	
	
	
		
 
VideoDriver_Cocoa::VideoDriver_Cocoa()

			




	
	
	
		
 
{

			




	
	
	
		
 
	this->setup         = false;

			




	
	
	
		
 
	this->buffer_locked = false;

			




	
	
	
		
 

			




	
	
	
		
 
	this->window    = nil;

			




	
	
	
		
 
	this->cocoaview = nil;

			




	
	
		
 
@@ -238,6 +239,30 @@ float VideoDriver_Cocoa::GetDPIScale()

			




	
	
	
		
 
	return this->cocoaview != nil ? [ this->cocoaview getContentsScale ] : 1.0f;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Lock video buffer for drawing if it isn't already mapped. */

			




	
	
	
		
 
bool VideoDriver_Cocoa::LockVideoBuffer()

			




	
	
	
		
 
{

			




	
	
	
		
 
	if (this->buffer_locked) return false;

			




	
	
	
		
 
	this->buffer_locked = true;

			




	
	
	
		
 

			




	
	
	
		
 
	_screen.dst_ptr = this->GetVideoPointer();

			




	
	
	
		
 
	assert(_screen.dst_ptr != nullptr);

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Unlock video buffer. */

			




	
	
	
		
 
void VideoDriver_Cocoa::UnlockVideoBuffer()

			




	
	
	
		
 
{

			




	
	
	
		
 
	if (_screen.dst_ptr != nullptr) {

			




	
	
	
		
 
		/* Hand video buffer back to the drawing backend. */

			




	
	
	
		
 
		this->ReleaseVideoPointer();

			




	
	
	
		
 
		_screen.dst_ptr = nullptr;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	this->buffer_locked = false;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Are we in fullscreen mode?

			




	
	
	
		
 
 * @return whether fullscreen mode is currently used

			




	
	
		
 
@@ -366,8 +391,6 @@ bool VideoDriver_Cocoa::MakeWindow(int w

			




	
	
	
		
 

			




	
	
	
		
 
	this->setup = false;

			




	
	
	
		
 

			




	
	
	
		
 
	this->AllocateBackingStore();

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -535,6 +558,8 @@ const char *VideoDriver_CocoaQuartz::Sta

			




	
	
	
		
 
		return "Could not create window";

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	this->AllocateBackingStore(true);

			




	
	
	
		
 

			




	
	
	
		
 
	if (fullscreen) this->ToggleFullscreen(fullscreen);

			




	
	
	
		
 

			




	
	
	
		
 
	this->GameSizeChanged();

			




	
	
		
 
@@ -560,7 +585,7 @@ NSView *VideoDriver_CocoaQuartz::Allocat

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Resize the window. */

			




	
	
	
		
 
void VideoDriver_CocoaQuartz::AllocateBackingStore()

			




	
	
	
		
 
void VideoDriver_CocoaQuartz::AllocateBackingStore(bool force)

			




	
	
	
		
 
{

			




	
	
	
		
 
	if (this->window == nil || this->cocoaview == nil || this->setup) return;

			




	
	
	
		
 

			




	
	
		
 
@@ -608,7 +633,7 @@ void VideoDriver_CocoaQuartz::AllocateBa

			




	
	
	
		
 
	_screen.width   = this->window_width;

			




	
	
	
		
 
	_screen.height  = this->window_height;

			




	
	
	
		
 
	_screen.pitch   = this->buffer_depth == 8 ? this->window_width : this->window_pitch;

			




	
	
	
		
 
	_screen.dst_ptr = this->buffer_depth == 8 ? this->pixel_buffer : this->window_buffer;

			




	
	
	
		
 
	_screen.dst_ptr = this->GetVideoPointer();

			




	
	
	
		
 

			




	
	
	
		
 
	/* Redraw screen */

			




	
	
	
		
 
	this->MakeDirty(0, 0, _screen.width, _screen.height);

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support