Drew Barbarello
557be7cf1b
* Use XRandR 1.2 to set fullscreen resolution for single output Squash of roothorick's PR #497 (also includes Kyzentun's CMake changes from PR #716) * Cherry-pick json c++1x stuff (b9e3d7174e) * Cherry-pick c++11 support from 5bba5c0038 and 9f8b045309 * rework Linux (X11) fullscreen, improve display-related Graphics Options Implement option to select between monitors for exclusive fullscreen mode on X11 (using XRandR 1.2), or use a fullscreen borderless window. Reimplement resolution/refresh rate/display mode-related option rows using Lua, update choices dynamically so only known-good groupings of resolution/refresh rate/aspect ratio can be selected. Minimally update Windows/MacOS LowLevelWindow implementations to support changes made for Linux side. Fullscreen Borderless Window/multi monitor support from X11 not implemented for those in this commit. * allow forcibly disabling xinerama use on Linux When libXinerama is available, SM tries to use it to find the proper monitor indexes to use to set _NET_WM_FULLSCREEN_MONITORS (on borderless fullscreen). xfwm4 seems to assume that monitors are numbered in increasing order from left to right (rather than using the Xinerama-assigned numbers), so _NET_WM_FULLSCREEN_MONITORS misbehaves on Xfce. This commit bypasses use of libXinerama, and instead forces SM to induce fullscreen on the desired monitor in the backup, hacky way: remove all window hints, move window to desired monitor, then add _NET_WM_STATE_FULLSCREEN hint. This works on mutter and Xfce. * Remove multiple warnings on redundant define. This used to be hard-coded due to pthread related items, but now it's dynamically determined. * fix _fallback menu behavior for unrecognized aspect ratios * Fix error recreating existing FS texture * Bump deployment target to 10.7 to use libc++ on XCode 8 * Add explicit casts to please clang * Update changelog
112 lines
4.8 KiB
C++
112 lines
4.8 KiB
C++
/* RageDisplay_Null - No-op diagnostic renderer. */
|
|
|
|
#ifndef RAGE_DISPLAY_NULL_H
|
|
#define RAGE_DISPLAY_NULL_H
|
|
|
|
class RageDisplay_Null: public RageDisplay
|
|
{
|
|
public:
|
|
RageDisplay_Null();
|
|
virtual RString Init( const VideoModeParams &p, bool bAllowUnacceleratedRenderer );
|
|
|
|
virtual RString GetApiDescription() const { return "Null"; }
|
|
virtual void GetDisplaySpecs(DisplaySpecs &out) const;
|
|
const RagePixelFormatDesc *GetPixelFormatDesc(RagePixelFormat pf) const;
|
|
|
|
bool BeginFrame() { return true; }
|
|
void EndFrame();
|
|
ActualVideoModeParams GetActualVideoModeParams() const { return m_Params; }
|
|
void SetBlendMode( BlendMode ) { }
|
|
bool SupportsTextureFormat( RagePixelFormat, bool /* realtime */ =false ) { return true; }
|
|
bool SupportsPerVertexMatrixScale() { return false; }
|
|
unsigned CreateTexture(
|
|
RagePixelFormat,
|
|
RageSurface* /* img */,
|
|
bool /* bGenerateMipMaps */ ) { return 1; }
|
|
void UpdateTexture(
|
|
unsigned /* iTexHandle */,
|
|
RageSurface* /* img */,
|
|
int /* xoffset */, int /* yoffset */, int /* width */, int /* height */
|
|
) { }
|
|
void DeleteTexture( unsigned /* iTexHandle */ ) { }
|
|
void ClearAllTextures() { }
|
|
int GetNumTextureUnits() { return 1; }
|
|
void SetTexture( TextureUnit, unsigned /* iTexture */ ) { }
|
|
void SetTextureMode( TextureUnit, TextureMode ) { }
|
|
void SetTextureWrapping( TextureUnit, bool ) { }
|
|
int GetMaxTextureSize() const { return 2048; }
|
|
void SetTextureFiltering( TextureUnit, bool ) { }
|
|
bool IsZWriteEnabled() const { return false; }
|
|
bool IsZTestEnabled() const { return false; }
|
|
void SetZWrite( bool ) { }
|
|
void SetZBias( float ) { }
|
|
void SetZTestMode( ZTestMode ) { }
|
|
void ClearZBuffer() { }
|
|
void SetCullMode( CullMode ) { }
|
|
void SetAlphaTest( bool ) { }
|
|
void SetMaterial(
|
|
const RageColor & /* unreferenced: emissive */,
|
|
const RageColor & /* unreferenced: ambient */,
|
|
const RageColor & /* unreferenced: diffuse */,
|
|
const RageColor & /* unreferenced: specular */,
|
|
float /* unreferenced: shininess */
|
|
) { }
|
|
void SetLighting( bool ) { }
|
|
void SetLightOff( int /* index */ ) { }
|
|
void SetLightDirectional(
|
|
int /* index */,
|
|
const RageColor & /* unreferenced: ambient */,
|
|
const RageColor & /* unreferenced: diffuse */,
|
|
const RageColor & /* unreferenced: specular */,
|
|
const RageVector3 & /* unreferenced: dir */ ) { }
|
|
|
|
void SetSphereEnvironmentMapping( TextureUnit /* tu */, bool /* b */ ) { }
|
|
void SetCelShaded( int /* stage */ ) { }
|
|
|
|
RageCompiledGeometry* CreateCompiledGeometry();
|
|
void DeleteCompiledGeometry( RageCompiledGeometry* );
|
|
|
|
protected:
|
|
void DrawQuadsInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
void DrawQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
void DrawFanInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
void DrawStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
void DrawTrianglesInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
void DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int /* iMeshIndex */ ) { }
|
|
void DrawLineStripInternal( const RageSpriteVertex v[], int /* iNumVerts */, float /* LineWidth */ ) { }
|
|
void DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int /* iNumVerts */ ) { }
|
|
|
|
VideoModeParams m_Params;
|
|
RString TryVideoMode( const VideoModeParams &p, bool & /* bNewDeviceOut */ ) { m_Params = p; return RString(); }
|
|
RageSurface* CreateScreenshot();
|
|
RageMatrix GetOrthoMatrix( float l, float r, float b, float t, float zn, float zf );
|
|
bool SupportsSurfaceFormat( RagePixelFormat ) { return true; }
|
|
};
|
|
|
|
#endif
|
|
/*
|
|
* Copyright (c) 2001-2004 Chris Danford, Glenn Maynard
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
* whom the Software is furnished to do so, provided that the above
|
|
* copyright notice(s) and this permission notice appear in all copies of
|
|
* the Software and that both the above copyright notice(s) and this
|
|
* permission notice appear in supporting documentation.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|