mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-20 11:21:43 +02:00
Merge branch 'GLES-software'
This commit is contained in:
Ryan Houdek
commit
67c1c6b062
36 changed files with 1962 additions and 911 deletions
|
|
@ -178,6 +178,10 @@ if(APPLE)
|
||||||
# page on x86_64 is 4GB in size.
|
# page on x86_64 is 4GB in size.
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
|
||||||
|
|
||||||
|
if(NOT DISABLE_WX)
|
||||||
|
add_definitions(-DUSE_WX -DHAVE_WX)
|
||||||
|
set(USE_WX TRUE)
|
||||||
|
endif()
|
||||||
find_library(APPKIT_LIBRARY AppKit)
|
find_library(APPKIT_LIBRARY AppKit)
|
||||||
find_library(APPSERV_LIBRARY ApplicationServices)
|
find_library(APPSERV_LIBRARY ApplicationServices)
|
||||||
find_library(ATB_LIBRARY AudioToolbox)
|
find_library(ATB_LIBRARY AudioToolbox)
|
||||||
|
|
@ -218,6 +222,15 @@ if(FASTLOG)
|
||||||
add_definitions(-DDEBUGFAST)
|
add_definitions(-DDEBUGFAST)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# For now GLES and EGL are tied to each other.
|
||||||
|
# Enabling GLES also disables the OpenGL plugin.
|
||||||
|
option(USE_GLES "Enables GLES, disables OGL" OFF)
|
||||||
|
if(USE_GLES)
|
||||||
|
message("GLES rendering enabled")
|
||||||
|
add_definitions(-DUSE_GLES)
|
||||||
|
add_definitions(-DUSE_EGL)
|
||||||
|
set(USE_EGL True)
|
||||||
|
endif()
|
||||||
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
|
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
|
|
|
||||||
|
|
@ -60,11 +60,6 @@ private:
|
||||||
#undef STACKALIGN
|
#undef STACKALIGN
|
||||||
#define STACKALIGN __attribute__((__force_align_arg_pointer__))
|
#define STACKALIGN __attribute__((__force_align_arg_pointer__))
|
||||||
#endif
|
#endif
|
||||||
// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support.
|
|
||||||
#ifdef __WXOSX_COCOA__
|
|
||||||
#define HAVE_WX 1
|
|
||||||
#define USE_WX 1 // Use wxGLCanvas
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif defined _WIN32
|
#elif defined _WIN32
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,9 @@
|
||||||
#include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h"
|
#include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h"
|
||||||
#include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
|
#include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef USE_GLES
|
||||||
#include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
|
#include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
|
||||||
|
#endif
|
||||||
#include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
|
#include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
|
||||||
|
|
||||||
std::vector<VideoBackend*> g_available_video_backends;
|
std::vector<VideoBackend*> g_available_video_backends;
|
||||||
|
|
@ -52,7 +54,9 @@ void VideoBackend::PopulateList()
|
||||||
if (IsGteVista())
|
if (IsGteVista())
|
||||||
g_available_video_backends.push_back(new DX11::VideoBackend);
|
g_available_video_backends.push_back(new DX11::VideoBackend);
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef USE_GLES
|
||||||
g_available_video_backends.push_back(new OGL::VideoBackend);
|
g_available_video_backends.push_back(new OGL::VideoBackend);
|
||||||
|
#endif
|
||||||
g_available_video_backends.push_back(new SW::VideoSoftware);
|
g_available_video_backends.push_back(new SW::VideoSoftware);
|
||||||
|
|
||||||
g_video_backend = g_available_video_backends.front();
|
g_video_backend = g_available_video_backends.front();
|
||||||
|
|
|
||||||
|
|
@ -192,7 +192,11 @@ set(SRCS Src/ActionReplay.cpp
|
||||||
Src/PowerPC/JitCommon/JitCache.cpp
|
Src/PowerPC/JitCommon/JitCache.cpp
|
||||||
Src/PowerPC/JitCommon/Jit_Util.cpp)
|
Src/PowerPC/JitCommon/Jit_Util.cpp)
|
||||||
|
|
||||||
set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network)
|
set(LIBS bdisasm inputcommon videosoftware sfml-network)
|
||||||
|
|
||||||
|
if(NOT USE_GLES)
|
||||||
|
set(LIBS ${LIBS} videoogl)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
|
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ set(LIBS core
|
||||||
z
|
z
|
||||||
sfml-network
|
sfml-network
|
||||||
${GTK2_LIBRARIES}
|
${GTK2_LIBRARIES}
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${XRANDR_LIBRARIES}
|
${XRANDR_LIBRARIES}
|
||||||
${X11_LIBRARIES})
|
${X11_LIBRARIES})
|
||||||
|
|
||||||
|
|
@ -31,7 +30,8 @@ if(LIBAV_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(wxWidgets_FOUND)
|
if(wxWidgets_FOUND)
|
||||||
set(SRCS Src/ARCodeAddEdit.cpp
|
set(SRCS
|
||||||
|
Src/ARCodeAddEdit.cpp
|
||||||
Src/AboutDolphin.cpp
|
Src/AboutDolphin.cpp
|
||||||
Src/CheatsWindow.cpp
|
Src/CheatsWindow.cpp
|
||||||
Src/ConfigMain.cpp
|
Src/ConfigMain.cpp
|
||||||
|
|
@ -79,7 +79,27 @@ if(wxWidgets_FOUND)
|
||||||
|
|
||||||
set(WXLIBS ${wxWidgets_LIBRARIES})
|
set(WXLIBS ${wxWidgets_LIBRARIES})
|
||||||
else()
|
else()
|
||||||
set(SRCS Src/MainNoGUI.cpp)
|
set(SRCS
|
||||||
|
Src/MainNoGUI.cpp)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(USE_EGL)
|
||||||
|
set(SRCS ${SRCS} Src/GLInterface/EGL.cpp
|
||||||
|
Src/GLInterface/X11_Util.cpp)
|
||||||
|
else()
|
||||||
|
if(WIN32)
|
||||||
|
set(SRCS ${SRCS} Src/GLInterface/GLW.cpp)
|
||||||
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
|
if(USE_WX)
|
||||||
|
set(SRCS ${SRCS} Src/GLInterface/WX.cpp)
|
||||||
|
else()
|
||||||
|
set(SRCS ${SRCS} Src/GLInterface/AGL.cpp)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
set(SRCS ${SRCS} Src/GLInterface/GLX.cpp
|
||||||
|
Src/GLInterface/X11_Util.cpp)
|
||||||
|
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -144,7 +144,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<OpenMPSupport>
|
<OpenMPSupport>
|
||||||
</OpenMPSupport>
|
</OpenMPSupport>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|
@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -188,7 +188,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<OpenMPSupport>
|
<OpenMPSupport>
|
||||||
</OpenMPSupport>
|
</OpenMPSupport>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|
@ -206,7 +206,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -267,6 +267,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
<ClCompile Include="Src\PHackSettings.cpp" />
|
<ClCompile Include="Src\PHackSettings.cpp" />
|
||||||
<ClCompile Include="Src\Debugger\RegisterView.cpp" />
|
<ClCompile Include="Src\Debugger\RegisterView.cpp" />
|
||||||
<ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
|
<ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
|
||||||
|
<ClCompile Include="Src\GLInterface\WGL.cpp" />
|
||||||
<ClCompile Include="Src\stdafx.cpp">
|
<ClCompile Include="Src\stdafx.cpp">
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
|
||||||
|
|
@ -328,6 +329,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
<ClInclude Include="Src\WiimoteConfigDiag.h" />
|
<ClInclude Include="Src\WiimoteConfigDiag.h" />
|
||||||
<ClInclude Include="Src\WXInputBase.h" />
|
<ClInclude Include="Src\WXInputBase.h" />
|
||||||
<ClInclude Include="Src\WxUtils.h" />
|
<ClInclude Include="Src\WxUtils.h" />
|
||||||
|
<ClInclude Include="Src\GLInterface.h" />
|
||||||
|
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
|
||||||
|
<ClInclude Include="Src\GLInterface\WGL.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\..\..\Installer\Dolphin.ico" />
|
<None Include="..\..\..\Installer\Dolphin.ico" />
|
||||||
|
|
|
||||||
75
Source/Core/DolphinWX/Src/GLInterface.h
Normal file
75
Source/Core/DolphinWX/Src/GLInterface.h
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _GLINTERFACE_H_
|
||||||
|
#define _GLINTERFACE_H_
|
||||||
|
|
||||||
|
#include "Thread.h"
|
||||||
|
|
||||||
|
#if defined(USE_EGL) && USE_EGL
|
||||||
|
#include "GLInterface/EGL.h"
|
||||||
|
#elif defined(USE_WX) && USE_WX
|
||||||
|
#include "GLInterface/WX.h"
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#include "GLInterface/AGL.h"
|
||||||
|
#elif defined(_WIN32)
|
||||||
|
#include "GLInterface/WGL.h"
|
||||||
|
#elif defined(HAVE_X11) && HAVE_X11
|
||||||
|
#include "GLInterface/GLX.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
|
||||||
|
int screen;
|
||||||
|
Display *dpy;
|
||||||
|
Display *evdpy;
|
||||||
|
Window win;
|
||||||
|
Window parent;
|
||||||
|
EGLSurface egl_surf;
|
||||||
|
EGLContext egl_ctx;
|
||||||
|
EGLDisplay egl_dpy;
|
||||||
|
XVisualInfo *vi;
|
||||||
|
XSetWindowAttributes attr;
|
||||||
|
std::thread xEventThread;
|
||||||
|
int x, y;
|
||||||
|
unsigned int width, height;
|
||||||
|
#elif defined(USE_WX) && USE_WX
|
||||||
|
wxGLCanvas *glCanvas;
|
||||||
|
wxGLContext *glCtxt;
|
||||||
|
wxPanel *panel;
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
NSWindow *cocoaWin;
|
||||||
|
NSOpenGLContext *cocoaCtx;
|
||||||
|
#elif defined(HAVE_X11) && HAVE_X11
|
||||||
|
int screen;
|
||||||
|
Window win;
|
||||||
|
Window parent;
|
||||||
|
// dpy used for glx stuff, evdpy for window events etc.
|
||||||
|
// evdpy is to be used by XEventThread only
|
||||||
|
Display *dpy, *evdpy;
|
||||||
|
XVisualInfo *vi;
|
||||||
|
GLXContext ctx;
|
||||||
|
XSetWindowAttributes attr;
|
||||||
|
std::thread xEventThread;
|
||||||
|
int x, y;
|
||||||
|
unsigned int width, height;
|
||||||
|
#endif
|
||||||
|
} GLWindow;
|
||||||
|
|
||||||
|
extern cInterfaceBase *GLInterface;
|
||||||
|
extern GLWindow GLWin;
|
||||||
|
|
||||||
|
#endif
|
||||||
123
Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
Normal file
123
Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
Normal file
|
|
@ -0,0 +1,123 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "VideoConfig.h"
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
|
||||||
|
#include "VertexShaderManager.h"
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "AGL.h"
|
||||||
|
|
||||||
|
void cInterfaceAGL::Swap()
|
||||||
|
{
|
||||||
|
[GLWin.cocoaCtx flushBuffer];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show the current FPS
|
||||||
|
void cInterfaceAGL::UpdateFPSDisplay(const char *text)
|
||||||
|
{
|
||||||
|
[GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create rendering window.
|
||||||
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
|
bool cInterfaceAGL::Create(void *&window_handle)
|
||||||
|
{
|
||||||
|
int _tx, _ty, _twidth, _theight;
|
||||||
|
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
||||||
|
|
||||||
|
// Control window size and picture scaling
|
||||||
|
s_backbuffer_width = _twidth;
|
||||||
|
s_backbuffer_height = _theight;
|
||||||
|
|
||||||
|
NSRect size;
|
||||||
|
NSUInteger style = NSMiniaturizableWindowMask;
|
||||||
|
NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
|
||||||
|
NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
|
||||||
|
initWithAttributes: attr];
|
||||||
|
if (fmt == nil) {
|
||||||
|
ERROR_LOG(VIDEO, "failed to create pixel format");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.cocoaCtx = [[NSOpenGLContext alloc]
|
||||||
|
initWithFormat: fmt shareContext: nil];
|
||||||
|
[fmt release];
|
||||||
|
if (GLWin.cocoaCtx == nil) {
|
||||||
|
ERROR_LOG(VIDEO, "failed to create context");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
|
||||||
|
size = [[NSScreen mainScreen] frame];
|
||||||
|
style |= NSBorderlessWindowMask;
|
||||||
|
} else {
|
||||||
|
size = NSMakeRect(_tx, _ty, _twidth, _theight);
|
||||||
|
style |= NSResizableWindowMask | NSTitledWindowMask;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size
|
||||||
|
styleMask: style backing: NSBackingStoreBuffered defer: NO];
|
||||||
|
if (GLWin.cocoaWin == nil) {
|
||||||
|
ERROR_LOG(VIDEO, "failed to create window");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
|
||||||
|
CGDisplayCapture(CGMainDisplayID());
|
||||||
|
[GLWin.cocoaWin setLevel: CGShieldingWindowLevel()];
|
||||||
|
}
|
||||||
|
|
||||||
|
[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
|
||||||
|
[GLWin.cocoaWin makeKeyAndOrderFront: nil];
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cInterfaceAGL::MakeCurrent()
|
||||||
|
{
|
||||||
|
[GLWin.cocoaCtx makeCurrentContext];
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update window width, size and etc. Called from Render.cpp
|
||||||
|
void cInterfaceAGL::Update()
|
||||||
|
{
|
||||||
|
int width, height;
|
||||||
|
|
||||||
|
width = [[GLWin.cocoaWin contentView] frame].size.width;
|
||||||
|
height = [[GLWin.cocoaWin contentView] frame].size.height;
|
||||||
|
if (width == s_backbuffer_width && height == s_backbuffer_height)
|
||||||
|
return;
|
||||||
|
|
||||||
|
[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
|
||||||
|
[GLWin.cocoaCtx update];
|
||||||
|
[GLWin.cocoaCtx makeCurrentContext];
|
||||||
|
s_backbuffer_width = width;
|
||||||
|
s_backbuffer_height = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close backend
|
||||||
|
void cInterfaceAGL::Shutdown()
|
||||||
|
{
|
||||||
|
[GLWin.cocoaWin close];
|
||||||
|
[GLWin.cocoaCtx clearDrawable];
|
||||||
|
[GLWin.cocoaCtx release];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
37
Source/Core/DolphinWX/Src/GLInterface/AGL.h
Normal file
37
Source/Core/DolphinWX/Src/GLInterface/AGL.h
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _INTERFACEAGL_H_
|
||||||
|
#define _INTERFACEAGL_H_
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include <GL/glew.h>
|
||||||
|
#import <AppKit/AppKit.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "InterfaceBase.h"
|
||||||
|
|
||||||
|
class cInterfaceAGL : public cInterfaceBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void Swap();
|
||||||
|
void UpdateFPSDisplay(const char *Text);
|
||||||
|
bool Create(void *&window_handle);
|
||||||
|
bool MakeCurrent();
|
||||||
|
void Shutdown();
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
190
Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
Normal file
190
Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
Normal file
|
|
@ -0,0 +1,190 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "EGL.h"
|
||||||
|
|
||||||
|
// Show the current FPS
|
||||||
|
void cInterfaceEGL::UpdateFPSDisplay(const char *text)
|
||||||
|
{
|
||||||
|
XStoreName(GLWin.dpy, GLWin.win, text);
|
||||||
|
}
|
||||||
|
void cInterfaceEGL::Swap()
|
||||||
|
{
|
||||||
|
eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create rendering window.
|
||||||
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
|
bool cInterfaceEGL::Create(void *&window_handle)
|
||||||
|
{
|
||||||
|
int _tx, _ty, _twidth, _theight;
|
||||||
|
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
||||||
|
|
||||||
|
// Control window size and picture scaling
|
||||||
|
s_backbuffer_width = _twidth;
|
||||||
|
s_backbuffer_height = _theight;
|
||||||
|
|
||||||
|
const char *s;
|
||||||
|
EGLint egl_major, egl_minor;
|
||||||
|
|
||||||
|
GLWin.dpy = XOpenDisplay(NULL);
|
||||||
|
|
||||||
|
if (!GLWin.dpy) {
|
||||||
|
printf("Error: couldn't open display\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.egl_dpy = eglGetDisplay(GLWin.dpy);
|
||||||
|
if (!GLWin.egl_dpy) {
|
||||||
|
printf("Error: eglGetDisplay() failed\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) {
|
||||||
|
printf("Error: eglInitialize() failed\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
s = eglQueryString(GLWin.egl_dpy, EGL_VERSION);
|
||||||
|
printf("EGL_VERSION = %s\n", s);
|
||||||
|
|
||||||
|
s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR);
|
||||||
|
printf("EGL_VENDOR = %s\n", s);
|
||||||
|
|
||||||
|
s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS);
|
||||||
|
printf("EGL_EXTENSIONS = %s\n", s);
|
||||||
|
|
||||||
|
s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS);
|
||||||
|
printf("EGL_CLIENT_APIS = %s\n", s);
|
||||||
|
|
||||||
|
// attributes for a visual in RGBA format with at least
|
||||||
|
// 8 bits per color and a 24 bit depth buffer
|
||||||
|
int attribs[] = {
|
||||||
|
EGL_RED_SIZE, 8,
|
||||||
|
EGL_GREEN_SIZE, 8,
|
||||||
|
EGL_BLUE_SIZE, 8,
|
||||||
|
EGL_DEPTH_SIZE, 24,
|
||||||
|
#ifdef USE_GLES
|
||||||
|
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
|
||||||
|
#else
|
||||||
|
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
|
||||||
|
#endif
|
||||||
|
EGL_NONE };
|
||||||
|
|
||||||
|
static const EGLint ctx_attribs[] = {
|
||||||
|
#ifdef USE_GLES
|
||||||
|
EGL_CONTEXT_CLIENT_VERSION, 2,
|
||||||
|
#endif
|
||||||
|
EGL_NONE
|
||||||
|
};
|
||||||
|
|
||||||
|
GLWin.evdpy = XOpenDisplay(NULL);
|
||||||
|
GLWin.parent = (Window)window_handle;
|
||||||
|
GLWin.screen = DefaultScreen(GLWin.dpy);
|
||||||
|
if (GLWin.parent == 0)
|
||||||
|
GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
|
||||||
|
|
||||||
|
XVisualInfo visTemplate;
|
||||||
|
int num_visuals;
|
||||||
|
EGLConfig config;
|
||||||
|
EGLint num_configs;
|
||||||
|
EGLint vid;
|
||||||
|
|
||||||
|
if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) {
|
||||||
|
printf("Error: couldn't get an EGL visual config\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) {
|
||||||
|
printf("Error: eglGetConfigAttrib() failed\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The X window visual must match the EGL config */
|
||||||
|
visTemplate.visualid = vid;
|
||||||
|
GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals);
|
||||||
|
if (!GLWin.vi) {
|
||||||
|
printf("Error: couldn't get X visual\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.x = _tx;
|
||||||
|
GLWin.y = _ty;
|
||||||
|
GLWin.width = _twidth;
|
||||||
|
GLWin.height = _theight;
|
||||||
|
|
||||||
|
XWindow.CreateXWindow();
|
||||||
|
#ifdef USE_GLES
|
||||||
|
eglBindAPI(EGL_OPENGL_ES_API);
|
||||||
|
#else
|
||||||
|
eglBindAPI(EGL_OPENGL_API);
|
||||||
|
#endif
|
||||||
|
GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs );
|
||||||
|
if (!GLWin.egl_ctx) {
|
||||||
|
printf("Error: eglCreateContext failed\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL);
|
||||||
|
if (!GLWin.egl_surf) {
|
||||||
|
printf("Error: eglCreateWindowSurface failed\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) {
|
||||||
|
|
||||||
|
printf("Error: eglMakeCurrent() failed\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
printf("GL_VENDOR: %s\n", glGetString(GL_VENDOR));
|
||||||
|
printf("GL_RENDERER: %s\n", glGetString(GL_RENDERER));
|
||||||
|
printf("GL_VERSION: %s\n", glGetString(GL_VERSION));
|
||||||
|
printf("GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS));
|
||||||
|
/* Set initial projection/viewing transformation.
|
||||||
|
* We can't be sure we'll get a ConfigureNotify event when the window
|
||||||
|
* first appears.
|
||||||
|
*/
|
||||||
|
glViewport(0, 0, (GLint) _twidth, (GLint) _theight);
|
||||||
|
window_handle = (void *)GLWin.win;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cInterfaceEGL::MakeCurrent()
|
||||||
|
{
|
||||||
|
return eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx);
|
||||||
|
}
|
||||||
|
// Close backend
|
||||||
|
void cInterfaceEGL::Shutdown()
|
||||||
|
{
|
||||||
|
XWindow.DestroyXWindow();
|
||||||
|
if (GLWin.egl_ctx && !eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx))
|
||||||
|
NOTICE_LOG(VIDEO, "Could not release drawing context.");
|
||||||
|
if (GLWin.egl_ctx)
|
||||||
|
{
|
||||||
|
eglDestroyContext(GLWin.egl_dpy, GLWin.egl_ctx);
|
||||||
|
eglDestroySurface(GLWin.egl_dpy, GLWin.egl_surf);
|
||||||
|
eglTerminate(GLWin.egl_dpy);
|
||||||
|
GLWin.egl_ctx = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
44
Source/Core/DolphinWX/Src/GLInterface/EGL.h
Normal file
44
Source/Core/DolphinWX/Src/GLInterface/EGL.h
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _INTERFACEGLX_H_
|
||||||
|
#define _INTERFACEGLX_H_
|
||||||
|
|
||||||
|
#include <EGL/egl.h>
|
||||||
|
#ifdef USE_GLES
|
||||||
|
#include <GLES2/gl2.h>
|
||||||
|
#else
|
||||||
|
#include <GL/glxew.h>
|
||||||
|
#include <GL/gl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "X11_Util.h"
|
||||||
|
#include "InterfaceBase.h"
|
||||||
|
|
||||||
|
class cInterfaceEGL : public cInterfaceBase
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
cX11Window XWindow;
|
||||||
|
public:
|
||||||
|
friend class cX11Window;
|
||||||
|
void Swap();
|
||||||
|
void UpdateFPSDisplay(const char *Text);
|
||||||
|
bool Create(void *&window_handle);
|
||||||
|
bool MakeCurrent();
|
||||||
|
void Shutdown();
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
151
Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
Normal file
151
Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
Normal file
|
|
@ -0,0 +1,151 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
#include "VideoConfig.h"
|
||||||
|
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "GLX.h"
|
||||||
|
|
||||||
|
// Show the current FPS
|
||||||
|
void cInterfaceGLX::UpdateFPSDisplay(const char *text)
|
||||||
|
{
|
||||||
|
XStoreName(GLWin.dpy, GLWin.win, text);
|
||||||
|
}
|
||||||
|
void cInterfaceGLX::Swap()
|
||||||
|
{
|
||||||
|
glXSwapBuffers(GLWin.dpy, GLWin.win);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create rendering window.
|
||||||
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
|
bool cInterfaceGLX::Create(void *&window_handle)
|
||||||
|
{
|
||||||
|
int _tx, _ty, _twidth, _theight;
|
||||||
|
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
||||||
|
|
||||||
|
// Control window size and picture scaling
|
||||||
|
s_backbuffer_width = _twidth;
|
||||||
|
s_backbuffer_height = _theight;
|
||||||
|
|
||||||
|
int glxMajorVersion, glxMinorVersion;
|
||||||
|
|
||||||
|
// attributes for a single buffered visual in RGBA format with at least
|
||||||
|
// 8 bits per color and a 24 bit depth buffer
|
||||||
|
int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8,
|
||||||
|
GLX_GREEN_SIZE, 8,
|
||||||
|
GLX_BLUE_SIZE, 8,
|
||||||
|
GLX_DEPTH_SIZE, 24,
|
||||||
|
None};
|
||||||
|
|
||||||
|
// attributes for a double buffered visual in RGBA format with at least
|
||||||
|
// 8 bits per color and a 24 bit depth buffer
|
||||||
|
int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
|
||||||
|
GLX_RED_SIZE, 8,
|
||||||
|
GLX_GREEN_SIZE, 8,
|
||||||
|
GLX_BLUE_SIZE, 8,
|
||||||
|
GLX_DEPTH_SIZE, 24,
|
||||||
|
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0,
|
||||||
|
GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0,
|
||||||
|
None };
|
||||||
|
|
||||||
|
int attrListDefault[] = {
|
||||||
|
GLX_RGBA,
|
||||||
|
GLX_RED_SIZE, 1,
|
||||||
|
GLX_GREEN_SIZE, 1,
|
||||||
|
GLX_BLUE_SIZE, 1,
|
||||||
|
GLX_DOUBLEBUFFER,
|
||||||
|
GLX_DEPTH_SIZE, 1,
|
||||||
|
None };
|
||||||
|
|
||||||
|
GLWin.dpy = XOpenDisplay(0);
|
||||||
|
GLWin.evdpy = XOpenDisplay(0);
|
||||||
|
GLWin.parent = (Window)window_handle;
|
||||||
|
GLWin.screen = DefaultScreen(GLWin.dpy);
|
||||||
|
if (GLWin.parent == 0)
|
||||||
|
GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
|
||||||
|
|
||||||
|
glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion);
|
||||||
|
NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion);
|
||||||
|
|
||||||
|
// Get an appropriate visual
|
||||||
|
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl);
|
||||||
|
if (GLWin.vi == NULL)
|
||||||
|
{
|
||||||
|
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl);
|
||||||
|
if (GLWin.vi != NULL)
|
||||||
|
{
|
||||||
|
ERROR_LOG(VIDEO, "Only single buffered visual!");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault);
|
||||||
|
if (GLWin.vi == NULL)
|
||||||
|
{
|
||||||
|
ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
NOTICE_LOG(VIDEO, "Got double buffered visual!");
|
||||||
|
|
||||||
|
// Create a GLX context.
|
||||||
|
GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE);
|
||||||
|
if (!GLWin.ctx)
|
||||||
|
{
|
||||||
|
PanicAlert("Unable to create GLX context.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLWin.x = _tx;
|
||||||
|
GLWin.y = _ty;
|
||||||
|
GLWin.width = _twidth;
|
||||||
|
GLWin.height = _theight;
|
||||||
|
|
||||||
|
XWindow.CreateXWindow();
|
||||||
|
window_handle = (void *)GLWin.win;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cInterfaceGLX::MakeCurrent()
|
||||||
|
{
|
||||||
|
// connect the glx-context to the window
|
||||||
|
#if defined(HAVE_WX) && (HAVE_WX)
|
||||||
|
Host_GetRenderWindowSize(GLWin.x, GLWin.y,
|
||||||
|
(int&)GLWin.width, (int&)GLWin.height);
|
||||||
|
XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y,
|
||||||
|
GLWin.width, GLWin.height);
|
||||||
|
#endif
|
||||||
|
return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
|
||||||
|
}
|
||||||
|
// Close backend
|
||||||
|
void cInterfaceGLX::Shutdown()
|
||||||
|
{
|
||||||
|
XWindow.DestroyXWindow();
|
||||||
|
if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL))
|
||||||
|
NOTICE_LOG(VIDEO, "Could not release drawing context.");
|
||||||
|
if (GLWin.ctx)
|
||||||
|
{
|
||||||
|
glXDestroyContext(GLWin.dpy, GLWin.ctx);
|
||||||
|
XCloseDisplay(GLWin.dpy);
|
||||||
|
XCloseDisplay(GLWin.evdpy);
|
||||||
|
GLWin.ctx = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
41
Source/Core/DolphinWX/Src/GLInterface/GLX.h
Normal file
41
Source/Core/DolphinWX/Src/GLInterface/GLX.h
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _INTERFACEGLX_H_
|
||||||
|
#define _INTERFACEGLX_H_
|
||||||
|
|
||||||
|
#include <GL/glxew.h>
|
||||||
|
#include <GL/gl.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
|
||||||
|
#include "X11_Util.h"
|
||||||
|
#include "InterfaceBase.h"
|
||||||
|
|
||||||
|
class cInterfaceGLX : public cInterfaceBase
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
cX11Window XWindow;
|
||||||
|
public:
|
||||||
|
friend class cX11Window;
|
||||||
|
void Swap();
|
||||||
|
void UpdateFPSDisplay(const char *Text);
|
||||||
|
bool Create(void *&window_handle);
|
||||||
|
bool MakeCurrent();
|
||||||
|
void Shutdown();
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
38
Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
Normal file
38
Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _GLINTERFACEBASE_H_
|
||||||
|
#define _GLINTERFACEBASE_H_
|
||||||
|
class cInterfaceBase
|
||||||
|
{
|
||||||
|
protected:
|
||||||
|
// Window dimensions.
|
||||||
|
u32 s_backbuffer_width;
|
||||||
|
u32 s_backbuffer_height;
|
||||||
|
public:
|
||||||
|
virtual void Swap() = 0;
|
||||||
|
virtual void UpdateFPSDisplay(const char *Text) = 0;
|
||||||
|
virtual bool Create(void *&window_handle) = 0;
|
||||||
|
virtual bool MakeCurrent() = 0;
|
||||||
|
virtual void Shutdown() = 0;
|
||||||
|
|
||||||
|
virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }
|
||||||
|
virtual u32 GetBackBufferHeight() { return s_backbuffer_height; }
|
||||||
|
virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; }
|
||||||
|
virtual void Update() { }
|
||||||
|
virtual bool PeekMessages() { return false; }
|
||||||
|
};
|
||||||
|
#endif
|
||||||
179
Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
Normal file
179
Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
Normal file
|
|
@ -0,0 +1,179 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "VideoConfig.h"
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
|
||||||
|
#include "VertexShaderManager.h"
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "WGL.h"
|
||||||
|
|
||||||
|
#include "EmuWindow.h"
|
||||||
|
static HDC hDC = NULL; // Private GDI Device Context
|
||||||
|
static HGLRC hRC = NULL; // Permanent Rendering Context
|
||||||
|
|
||||||
|
void cInterfaceWGL::Swap()
|
||||||
|
{
|
||||||
|
SwapBuffers(hDC);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw messages on top of the screen
|
||||||
|
bool cInterfaceWGL::PeekMessages()
|
||||||
|
{
|
||||||
|
// TODO: peekmessage
|
||||||
|
MSG msg;
|
||||||
|
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
|
||||||
|
{
|
||||||
|
if (msg.message == WM_QUIT)
|
||||||
|
return FALSE;
|
||||||
|
TranslateMessage(&msg);
|
||||||
|
DispatchMessage(&msg);
|
||||||
|
}
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show the current FPS
|
||||||
|
void cInterfaceWGL::UpdateFPSDisplay(const char *text)
|
||||||
|
{
|
||||||
|
TCHAR temp[512];
|
||||||
|
swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text);
|
||||||
|
EmuWindow::SetWindowText(temp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create rendering window.
|
||||||
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
|
bool cInterfaceWGL::Create(void *&window_handle)
|
||||||
|
{
|
||||||
|
int _tx, _ty, _twidth, _theight;
|
||||||
|
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
||||||
|
|
||||||
|
// Control window size and picture scaling
|
||||||
|
s_backbuffer_width = _twidth;
|
||||||
|
s_backbuffer_height = _theight;
|
||||||
|
|
||||||
|
window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait..."));
|
||||||
|
if (window_handle == NULL)
|
||||||
|
{
|
||||||
|
Host_SysMessage("failed to create window");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show the window
|
||||||
|
EmuWindow::Show();
|
||||||
|
|
||||||
|
PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be
|
||||||
|
{
|
||||||
|
sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor
|
||||||
|
1, // Version Number
|
||||||
|
PFD_DRAW_TO_WINDOW | // Format Must Support Window
|
||||||
|
PFD_SUPPORT_OPENGL | // Format Must Support OpenGL
|
||||||
|
PFD_DOUBLEBUFFER, // Must Support Double Buffering
|
||||||
|
PFD_TYPE_RGBA, // Request An RGBA Format
|
||||||
|
32, // Select Our Color Depth
|
||||||
|
0, 0, 0, 0, 0, 0, // Color Bits Ignored
|
||||||
|
0, // 8bit Alpha Buffer
|
||||||
|
0, // Shift Bit Ignored
|
||||||
|
0, // No Accumulation Buffer
|
||||||
|
0, 0, 0, 0, // Accumulation Bits Ignored
|
||||||
|
24, // 24Bit Z-Buffer (Depth Buffer)
|
||||||
|
8, // 8bit Stencil Buffer
|
||||||
|
0, // No Auxiliary Buffer
|
||||||
|
PFD_MAIN_PLANE, // Main Drawing Layer
|
||||||
|
0, // Reserved
|
||||||
|
0, 0, 0 // Layer Masks Ignored
|
||||||
|
};
|
||||||
|
|
||||||
|
GLuint PixelFormat; // Holds The Results After Searching For A Match
|
||||||
|
|
||||||
|
if (!(hDC=GetDC(EmuWindow::GetWnd()))) {
|
||||||
|
PanicAlert("(1) Can't create an OpenGL Device context. Fail.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) {
|
||||||
|
PanicAlert("(2) Can't find a suitable PixelFormat.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!SetPixelFormat(hDC, PixelFormat, &pfd)) {
|
||||||
|
PanicAlert("(3) Can't set the PixelFormat.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!(hRC = wglCreateContext(hDC))) {
|
||||||
|
PanicAlert("(4) Can't create an OpenGL rendering context.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cInterfaceWGL::MakeCurrent()
|
||||||
|
{
|
||||||
|
return wglMakeCurrent(hDC, hRC) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update window width, size and etc. Called from Render.cpp
|
||||||
|
void cInterfaceWGL::Update()
|
||||||
|
{
|
||||||
|
RECT rcWindow;
|
||||||
|
if (!EmuWindow::GetParentWnd())
|
||||||
|
{
|
||||||
|
// We are not rendering to a child window - use client size.
|
||||||
|
GetClientRect(EmuWindow::GetWnd(), &rcWindow);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We are rendering to a child window - use parent size.
|
||||||
|
GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the new window width and height
|
||||||
|
// See below for documentation
|
||||||
|
int width = rcWindow.right - rcWindow.left;
|
||||||
|
int height = rcWindow.bottom - rcWindow.top;
|
||||||
|
|
||||||
|
// If we are rendering to a child window
|
||||||
|
if (EmuWindow::GetParentWnd() != 0 &&
|
||||||
|
(s_backbuffer_width != width || s_backbuffer_height != height) &&
|
||||||
|
width >= 4 && height >= 4)
|
||||||
|
{
|
||||||
|
::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
|
||||||
|
s_backbuffer_width = width;
|
||||||
|
s_backbuffer_height = height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close backend
|
||||||
|
void cInterfaceWGL::Shutdown()
|
||||||
|
{
|
||||||
|
if (hRC)
|
||||||
|
{
|
||||||
|
if (!wglMakeCurrent(NULL, NULL))
|
||||||
|
NOTICE_LOG(VIDEO, "Could not release drawing context.");
|
||||||
|
|
||||||
|
if (!wglDeleteContext(hRC))
|
||||||
|
ERROR_LOG(VIDEO, "Release Rendering Context Failed.");
|
||||||
|
|
||||||
|
hRC = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
|
||||||
|
{
|
||||||
|
ERROR_LOG(VIDEO, "Release Device Context Failed.");
|
||||||
|
hDC = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
41
Source/Core/DolphinWX/Src/GLInterface/WGL.h
Normal file
41
Source/Core/DolphinWX/Src/GLInterface/WGL.h
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _INTERFACEWGL_H_
|
||||||
|
#define _INTERFACEWGL_H_
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define GLEW_STATIC
|
||||||
|
#include <GL/glew.h>
|
||||||
|
#include <GL/wglew.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "InterfaceBase.h"
|
||||||
|
|
||||||
|
class cInterfaceWGL : public cInterfaceBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void Swap();
|
||||||
|
void UpdateFPSDisplay(const char *Text);
|
||||||
|
bool Create(void *&window_handle);
|
||||||
|
bool MakeCurrent();
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
void Update();
|
||||||
|
bool PeekMessages();
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
82
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Normal file
82
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Normal file
|
|
@ -0,0 +1,82 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "VideoConfig.h"
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
|
||||||
|
#include "VertexShaderManager.h"
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "WX.h"
|
||||||
|
|
||||||
|
void cInterfaceWX::Swap()
|
||||||
|
{
|
||||||
|
GLWin.glCanvas->SwapBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
void cInterfaceWX::UpdateFPSDisplay(const char *text)
|
||||||
|
{
|
||||||
|
// Handled by Host_UpdateTitle()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create rendering window.
|
||||||
|
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
||||||
|
bool cInterfaceWX::Create(void *&window_handle)
|
||||||
|
{
|
||||||
|
int _tx, _ty, _twidth, _theight;
|
||||||
|
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
||||||
|
|
||||||
|
// Control window size and picture scaling
|
||||||
|
s_backbuffer_width = _twidth;
|
||||||
|
s_backbuffer_height = _theight;
|
||||||
|
|
||||||
|
GLWin.panel = (wxPanel *)window_handle;
|
||||||
|
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
|
||||||
|
wxPoint(0, 0), wxSize(_twidth, _theight));
|
||||||
|
GLWin.glCanvas->Show(true);
|
||||||
|
if (GLWin.glCtxt == NULL) // XXX dirty hack
|
||||||
|
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cInterfaceWX::MakeCurrent()
|
||||||
|
{
|
||||||
|
return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update window width, size and etc. Called from Render.cpp
|
||||||
|
void cInterfaceWX::Update()
|
||||||
|
{
|
||||||
|
int width, height;
|
||||||
|
|
||||||
|
GLWin.panel->GetSize(&width, &height);
|
||||||
|
if (width == s_backbuffer_width && height == s_backbuffer_height)
|
||||||
|
return;
|
||||||
|
|
||||||
|
GLWin.glCanvas->SetFocus();
|
||||||
|
GLWin.glCanvas->SetSize(0, 0, width, height);
|
||||||
|
GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
|
||||||
|
s_backbuffer_width = width;
|
||||||
|
s_backbuffer_height = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close backend
|
||||||
|
void cInterfaceWX::Shutdown()
|
||||||
|
{
|
||||||
|
GLWin.glCanvas->Hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
47
Source/Core/DolphinWX/Src/GLInterface/WX.h
Normal file
47
Source/Core/DolphinWX/Src/GLInterface/WX.h
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _INTERFACEWX_H_
|
||||||
|
#define _INTERFACEWX_H_
|
||||||
|
|
||||||
|
#if defined HAVE_X11 && HAVE_X11
|
||||||
|
#include <GL/glxew.h>
|
||||||
|
#include <GL/gl.h>
|
||||||
|
#elif defined __APPLE__
|
||||||
|
#include <GL/glew.h>
|
||||||
|
#import <AppKit/AppKit.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined USE_WX && USE_WX
|
||||||
|
#include "wx/wx.h"
|
||||||
|
#include "wx/glcanvas.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "InterfaceBase.h"
|
||||||
|
|
||||||
|
class cInterfaceWX : public cInterfaceBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void Swap();
|
||||||
|
void UpdateFPSDisplay(const char *Text);
|
||||||
|
bool Create(void *&window_handle);
|
||||||
|
bool MakeCurrent();
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
void Update();
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
213
Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
Normal file
213
Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
Normal file
|
|
@ -0,0 +1,213 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
#include "Host.h"
|
||||||
|
#include "RenderBase.h"
|
||||||
|
#include "VideoConfig.h"
|
||||||
|
#include "../GLInterface.h"
|
||||||
|
#include "VertexShaderManager.h"
|
||||||
|
|
||||||
|
void cX11Window::CreateXWindow(void)
|
||||||
|
{
|
||||||
|
Atom wmProtocols[1];
|
||||||
|
|
||||||
|
// Setup window attributes
|
||||||
|
GLWin.attr.colormap = XCreateColormap(GLWin.evdpy,
|
||||||
|
GLWin.parent, GLWin.vi->visual, AllocNone);
|
||||||
|
GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
|
||||||
|
GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen);
|
||||||
|
GLWin.attr.border_pixel = 0;
|
||||||
|
|
||||||
|
// Create the window
|
||||||
|
GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent,
|
||||||
|
GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0,
|
||||||
|
GLWin.vi->depth, InputOutput, GLWin.vi->visual,
|
||||||
|
CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
|
||||||
|
wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
|
||||||
|
XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
|
||||||
|
XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
|
||||||
|
XMapRaised(GLWin.evdpy, GLWin.win);
|
||||||
|
XSync(GLWin.evdpy, True);
|
||||||
|
|
||||||
|
GLWin.xEventThread = std::thread(&cX11Window::XEventThread, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
void cX11Window::DestroyXWindow(void)
|
||||||
|
{
|
||||||
|
XUnmapWindow(GLWin.dpy, GLWin.win);
|
||||||
|
GLWin.win = 0;
|
||||||
|
if (GLWin.xEventThread.joinable())
|
||||||
|
GLWin.xEventThread.join();
|
||||||
|
XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
|
||||||
|
}
|
||||||
|
|
||||||
|
void cX11Window::XEventThread()
|
||||||
|
{
|
||||||
|
// Free look variables
|
||||||
|
static bool mouseLookEnabled = false;
|
||||||
|
static bool mouseMoveEnabled = false;
|
||||||
|
static float lastMouse[2];
|
||||||
|
while (GLWin.win)
|
||||||
|
{
|
||||||
|
XEvent event;
|
||||||
|
KeySym key;
|
||||||
|
for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
|
||||||
|
{
|
||||||
|
XNextEvent(GLWin.evdpy, &event);
|
||||||
|
switch(event.type) {
|
||||||
|
case KeyPress:
|
||||||
|
key = XLookupKeysym((XKeyEvent*)&event, 0);
|
||||||
|
switch (key)
|
||||||
|
{
|
||||||
|
case XK_3:
|
||||||
|
OSDChoice = 1;
|
||||||
|
// Toggle native resolution
|
||||||
|
g_Config.iEFBScale = g_Config.iEFBScale + 1;
|
||||||
|
if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
|
||||||
|
break;
|
||||||
|
case XK_4:
|
||||||
|
OSDChoice = 2;
|
||||||
|
// Toggle aspect ratio
|
||||||
|
g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
|
||||||
|
break;
|
||||||
|
case XK_5:
|
||||||
|
OSDChoice = 3;
|
||||||
|
// Toggle EFB copy
|
||||||
|
if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
|
||||||
|
{
|
||||||
|
g_Config.bEFBCopyEnable ^= true;
|
||||||
|
g_Config.bCopyEFBToTexture = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case XK_6:
|
||||||
|
OSDChoice = 4;
|
||||||
|
g_Config.bDisableFog = !g_Config.bDisableFog;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (g_Config.bFreeLook)
|
||||||
|
{
|
||||||
|
static float debugSpeed = 1.0f;
|
||||||
|
switch (key)
|
||||||
|
{
|
||||||
|
case XK_parenleft:
|
||||||
|
debugSpeed /= 2.0f;
|
||||||
|
break;
|
||||||
|
case XK_parenright:
|
||||||
|
debugSpeed *= 2.0f;
|
||||||
|
break;
|
||||||
|
case XK_w:
|
||||||
|
VertexShaderManager::TranslateView(0.0f, debugSpeed);
|
||||||
|
break;
|
||||||
|
case XK_s:
|
||||||
|
VertexShaderManager::TranslateView(0.0f, -debugSpeed);
|
||||||
|
break;
|
||||||
|
case XK_a:
|
||||||
|
VertexShaderManager::TranslateView(debugSpeed, 0.0f);
|
||||||
|
break;
|
||||||
|
case XK_d:
|
||||||
|
VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
|
||||||
|
break;
|
||||||
|
case XK_r:
|
||||||
|
VertexShaderManager::ResetView();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ButtonPress:
|
||||||
|
if (g_Config.bFreeLook)
|
||||||
|
{
|
||||||
|
switch (event.xbutton.button)
|
||||||
|
{
|
||||||
|
case 2: // Middle button
|
||||||
|
lastMouse[0] = event.xbutton.x;
|
||||||
|
lastMouse[1] = event.xbutton.y;
|
||||||
|
mouseMoveEnabled = true;
|
||||||
|
break;
|
||||||
|
case 3: // Right button
|
||||||
|
lastMouse[0] = event.xbutton.x;
|
||||||
|
lastMouse[1] = event.xbutton.y;
|
||||||
|
mouseLookEnabled = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ButtonRelease:
|
||||||
|
if (g_Config.bFreeLook)
|
||||||
|
{
|
||||||
|
switch (event.xbutton.button)
|
||||||
|
{
|
||||||
|
case 2: // Middle button
|
||||||
|
mouseMoveEnabled = false;
|
||||||
|
break;
|
||||||
|
case 3: // Right button
|
||||||
|
mouseLookEnabled = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MotionNotify:
|
||||||
|
if (g_Config.bFreeLook)
|
||||||
|
{
|
||||||
|
if (mouseLookEnabled)
|
||||||
|
{
|
||||||
|
VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f,
|
||||||
|
(event.xmotion.y - lastMouse[1]) / 200.0f);
|
||||||
|
lastMouse[0] = event.xmotion.x;
|
||||||
|
lastMouse[1] = event.xmotion.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mouseMoveEnabled)
|
||||||
|
{
|
||||||
|
VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f,
|
||||||
|
(event.xmotion.y - lastMouse[1]) / 50.0f);
|
||||||
|
lastMouse[0] = event.xmotion.x;
|
||||||
|
lastMouse[1] = event.xmotion.y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ConfigureNotify:
|
||||||
|
Window winDummy;
|
||||||
|
unsigned int borderDummy, depthDummy;
|
||||||
|
XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
|
||||||
|
&GLWin.width, &GLWin.height, &borderDummy, &depthDummy);
|
||||||
|
GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height);
|
||||||
|
break;
|
||||||
|
case ClientMessage:
|
||||||
|
if ((unsigned long) event.xclient.data.l[0] ==
|
||||||
|
XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
|
||||||
|
Host_Message(WM_USER_STOP);
|
||||||
|
if ((unsigned long) event.xclient.data.l[0] ==
|
||||||
|
XInternAtom(GLWin.evdpy, "RESIZE", False))
|
||||||
|
XMoveResizeWindow(GLWin.evdpy, GLWin.win,
|
||||||
|
event.xclient.data.l[1], event.xclient.data.l[2],
|
||||||
|
event.xclient.data.l[3], event.xclient.data.l[4]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Common::SleepCurrentThread(20);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
31
Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
Normal file
31
Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
// Copyright (C) 2003 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
#ifndef _X11_UTIL_H_
|
||||||
|
#define _X11_UTIL_H_
|
||||||
|
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
|
||||||
|
class cX11Window
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
void XEventThread();
|
||||||
|
public:
|
||||||
|
void CreateXWindow(void);
|
||||||
|
void DestroyXWindow(void);
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
add_subdirectory(Plugin_VideoOGL)
|
if(NOT USE_GLES)
|
||||||
|
add_subdirectory(Plugin_VideoOGL)
|
||||||
|
endif()
|
||||||
add_subdirectory(Plugin_VideoSoftware)
|
add_subdirectory(Plugin_VideoSoftware)
|
||||||
# TODO: Add other backends here!
|
# TODO: Add other backends here!
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,22 @@ set(SRCS Src/FramebufferManager.cpp
|
||||||
Src/VertexManager.cpp)
|
Src/VertexManager.cpp)
|
||||||
|
|
||||||
set(LIBS videocommon
|
set(LIBS videocommon
|
||||||
GLEW
|
|
||||||
SOIL
|
SOIL
|
||||||
common
|
common
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${X11_LIBRARIES})
|
${X11_LIBRARIES})
|
||||||
|
if(USE_EGL)
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
EGL)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(USE_GLES)
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
GLESv2)
|
||||||
|
else()
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
GLEW
|
||||||
|
${OPENGL_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
if(wxWidgets_FOUND)
|
if(wxWidgets_FOUND)
|
||||||
set(LIBS ${LIBS} ${wxWidgets_LIBRARIES})
|
set(LIBS ${LIBS} ${wxWidgets_LIBRARIES})
|
||||||
|
|
|
||||||
|
|
@ -247,4 +247,4 @@
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -28,59 +28,8 @@
|
||||||
|
|
||||||
#include "GLUtil.h"
|
#include "GLUtil.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
#include "EmuWindow.h"
|
|
||||||
static HDC hDC = NULL; // Private GDI Device Context
|
|
||||||
static HGLRC hRC = NULL; // Permanent Rendering Context
|
|
||||||
#else
|
|
||||||
GLWindow GLWin;
|
GLWindow GLWin;
|
||||||
#endif
|
cInterfaceBase *GLInterface;
|
||||||
|
|
||||||
// Handles OpenGL and the window
|
|
||||||
|
|
||||||
// Window dimensions.
|
|
||||||
static int s_backbuffer_width;
|
|
||||||
static int s_backbuffer_height;
|
|
||||||
|
|
||||||
void OpenGL_SwapBuffers()
|
|
||||||
{
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
GLWin.glCanvas->SwapBuffers();
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
[GLWin.cocoaCtx flushBuffer];
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
SwapBuffers(hDC);
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
glXSwapBuffers(GLWin.dpy, GLWin.win);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 OpenGL_GetBackbufferWidth()
|
|
||||||
{
|
|
||||||
return s_backbuffer_width;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 OpenGL_GetBackbufferHeight()
|
|
||||||
{
|
|
||||||
return s_backbuffer_height;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGL_SetWindowText(const char *text)
|
|
||||||
{
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
// Handled by Host_UpdateTitle()
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
[GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]];
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
TCHAR temp[512];
|
|
||||||
swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text);
|
|
||||||
EmuWindow::SetWindowText(temp);
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
// Tell X to ask the window manager to set the window title.
|
|
||||||
// (X itself doesn't provide window title functionality.)
|
|
||||||
XStoreName(GLWin.dpy, GLWin.win, text);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace OGL
|
namespace OGL
|
||||||
{
|
{
|
||||||
|
|
@ -88,20 +37,7 @@ namespace OGL
|
||||||
// Draw messages on top of the screen
|
// Draw messages on top of the screen
|
||||||
unsigned int VideoBackend::PeekMessages()
|
unsigned int VideoBackend::PeekMessages()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
return GLInterface->PeekMessages();
|
||||||
// TODO: peekmessage
|
|
||||||
MSG msg;
|
|
||||||
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
|
|
||||||
{
|
|
||||||
if (msg.message == WM_QUIT)
|
|
||||||
return FALSE;
|
|
||||||
TranslateMessage(&msg);
|
|
||||||
DispatchMessage(&msg);
|
|
||||||
}
|
|
||||||
return TRUE;
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show the current FPS
|
// Show the current FPS
|
||||||
|
|
@ -109,523 +45,86 @@ void VideoBackend::UpdateFPSDisplay(const char *text)
|
||||||
{
|
{
|
||||||
char temp[100];
|
char temp[100];
|
||||||
snprintf(temp, sizeof temp, "%s | OpenGL | %s", scm_rev_str, text);
|
snprintf(temp, sizeof temp, "%s | OpenGL | %s", scm_rev_str, text);
|
||||||
OpenGL_SetWindowText(temp);
|
return GLInterface->UpdateFPSDisplay(temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
void InitInterface()
|
||||||
#if defined(HAVE_X11) && HAVE_X11
|
|
||||||
void XEventThread();
|
|
||||||
|
|
||||||
void CreateXWindow(void)
|
|
||||||
{
|
{
|
||||||
Atom wmProtocols[1];
|
#if defined(USE_EGL) && USE_EGL
|
||||||
|
GLInterface = new cInterfaceEGL;
|
||||||
// Setup window attributes
|
#elif defined(USE_WX) && USE_WX
|
||||||
GLWin.attr.colormap = XCreateColormap(GLWin.evdpy,
|
GLInterface = new cInterfaceWX;
|
||||||
GLWin.parent, GLWin.vi->visual, AllocNone);
|
#elif defined(__APPLE__)
|
||||||
GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
|
GLInterface = new cInterfaceAGL;
|
||||||
GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen);
|
#elif defined(_WIN32)
|
||||||
GLWin.attr.border_pixel = 0;
|
GLInterface = new cInterfaceWGL;
|
||||||
|
#elif defined(HAVE_X11) && HAVE_X11
|
||||||
// Create the window
|
GLInterface = new cInterfaceGLX;
|
||||||
GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent,
|
#endif
|
||||||
GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0,
|
|
||||||
GLWin.vi->depth, InputOutput, GLWin.vi->visual,
|
|
||||||
CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
|
|
||||||
wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
|
|
||||||
XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
|
|
||||||
XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
|
|
||||||
XMapRaised(GLWin.evdpy, GLWin.win);
|
|
||||||
XSync(GLWin.evdpy, True);
|
|
||||||
|
|
||||||
GLWin.xEventThread = std::thread(XEventThread);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DestroyXWindow(void)
|
GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader )
|
||||||
{
|
{
|
||||||
XUnmapWindow(GLWin.dpy, GLWin.win);
|
// generate objects
|
||||||
GLWin.win = 0;
|
GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
|
||||||
if (GLWin.xEventThread.joinable())
|
GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
|
||||||
GLWin.xEventThread.join();
|
GLuint programID = glCreateProgram();
|
||||||
XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
|
GLint Result = GL_FALSE;
|
||||||
}
|
char stringBuffer[1024];
|
||||||
|
GLsizei stringBufferUsage = 0;
|
||||||
void XEventThread()
|
|
||||||
{
|
|
||||||
// Free look variables
|
|
||||||
static bool mouseLookEnabled = false;
|
|
||||||
static bool mouseMoveEnabled = false;
|
|
||||||
static float lastMouse[2];
|
|
||||||
while (GLWin.win)
|
|
||||||
{
|
|
||||||
XEvent event;
|
|
||||||
KeySym key;
|
|
||||||
for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
|
|
||||||
{
|
|
||||||
XNextEvent(GLWin.evdpy, &event);
|
|
||||||
switch(event.type) {
|
|
||||||
case KeyPress:
|
|
||||||
key = XLookupKeysym((XKeyEvent*)&event, 0);
|
|
||||||
switch (key)
|
|
||||||
{
|
|
||||||
case XK_3:
|
|
||||||
OSDChoice = 1;
|
|
||||||
// Toggle native resolution
|
|
||||||
g_Config.iEFBScale = g_Config.iEFBScale + 1;
|
|
||||||
if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
|
|
||||||
break;
|
|
||||||
case XK_4:
|
|
||||||
OSDChoice = 2;
|
|
||||||
// Toggle aspect ratio
|
|
||||||
g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
|
|
||||||
break;
|
|
||||||
case XK_5:
|
|
||||||
OSDChoice = 3;
|
|
||||||
// Toggle EFB copy
|
|
||||||
if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
|
|
||||||
{
|
|
||||||
g_Config.bEFBCopyEnable ^= true;
|
|
||||||
g_Config.bCopyEFBToTexture = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_6:
|
|
||||||
OSDChoice = 4;
|
|
||||||
g_Config.bDisableFog = !g_Config.bDisableFog;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (g_Config.bFreeLook)
|
|
||||||
{
|
|
||||||
static float debugSpeed = 1.0f;
|
|
||||||
switch (key)
|
|
||||||
{
|
|
||||||
case XK_parenleft:
|
|
||||||
debugSpeed /= 2.0f;
|
|
||||||
break;
|
|
||||||
case XK_parenright:
|
|
||||||
debugSpeed *= 2.0f;
|
|
||||||
break;
|
|
||||||
case XK_w:
|
|
||||||
VertexShaderManager::TranslateView(0.0f, debugSpeed);
|
|
||||||
break;
|
|
||||||
case XK_s:
|
|
||||||
VertexShaderManager::TranslateView(0.0f, -debugSpeed);
|
|
||||||
break;
|
|
||||||
case XK_a:
|
|
||||||
VertexShaderManager::TranslateView(debugSpeed, 0.0f);
|
|
||||||
break;
|
|
||||||
case XK_d:
|
|
||||||
VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
|
|
||||||
break;
|
|
||||||
case XK_r:
|
|
||||||
VertexShaderManager::ResetView();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ButtonPress:
|
|
||||||
if (g_Config.bFreeLook)
|
|
||||||
{
|
|
||||||
switch (event.xbutton.button)
|
|
||||||
{
|
|
||||||
case 2: // Middle button
|
|
||||||
lastMouse[0] = event.xbutton.x;
|
|
||||||
lastMouse[1] = event.xbutton.y;
|
|
||||||
mouseMoveEnabled = true;
|
|
||||||
break;
|
|
||||||
case 3: // Right button
|
|
||||||
lastMouse[0] = event.xbutton.x;
|
|
||||||
lastMouse[1] = event.xbutton.y;
|
|
||||||
mouseLookEnabled = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ButtonRelease:
|
|
||||||
if (g_Config.bFreeLook)
|
|
||||||
{
|
|
||||||
switch (event.xbutton.button)
|
|
||||||
{
|
|
||||||
case 2: // Middle button
|
|
||||||
mouseMoveEnabled = false;
|
|
||||||
break;
|
|
||||||
case 3: // Right button
|
|
||||||
mouseLookEnabled = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case MotionNotify:
|
|
||||||
if (g_Config.bFreeLook)
|
|
||||||
{
|
|
||||||
if (mouseLookEnabled)
|
|
||||||
{
|
|
||||||
VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f,
|
|
||||||
(event.xmotion.y - lastMouse[1]) / 200.0f);
|
|
||||||
lastMouse[0] = event.xmotion.x;
|
|
||||||
lastMouse[1] = event.xmotion.y;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mouseMoveEnabled)
|
|
||||||
{
|
|
||||||
VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f,
|
|
||||||
(event.xmotion.y - lastMouse[1]) / 50.0f);
|
|
||||||
lastMouse[0] = event.xmotion.x;
|
|
||||||
lastMouse[1] = event.xmotion.y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ConfigureNotify:
|
|
||||||
Window winDummy;
|
|
||||||
unsigned int borderDummy, depthDummy;
|
|
||||||
XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
|
|
||||||
&GLWin.width, &GLWin.height, &borderDummy, &depthDummy);
|
|
||||||
s_backbuffer_width = GLWin.width;
|
|
||||||
s_backbuffer_height = GLWin.height;
|
|
||||||
break;
|
|
||||||
case ClientMessage:
|
|
||||||
if ((unsigned long) event.xclient.data.l[0] ==
|
|
||||||
XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
|
|
||||||
Host_Message(WM_USER_STOP);
|
|
||||||
if ((unsigned long) event.xclient.data.l[0] ==
|
|
||||||
XInternAtom(GLWin.evdpy, "RESIZE", False))
|
|
||||||
XMoveResizeWindow(GLWin.evdpy, GLWin.win,
|
|
||||||
event.xclient.data.l[1], event.xclient.data.l[2],
|
|
||||||
event.xclient.data.l[3], event.xclient.data.l[4]);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Common::SleepCurrentThread(20);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Create rendering window.
|
|
||||||
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
|
|
||||||
bool OpenGL_Create(void *&window_handle)
|
|
||||||
{
|
|
||||||
int _tx, _ty, _twidth, _theight;
|
|
||||||
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
|
|
||||||
|
|
||||||
// Control window size and picture scaling
|
|
||||||
s_backbuffer_width = _twidth;
|
|
||||||
s_backbuffer_height = _theight;
|
|
||||||
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
GLWin.panel = (wxPanel *)window_handle;
|
|
||||||
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
|
|
||||||
wxPoint(0, 0), wxSize(_twidth, _theight));
|
|
||||||
GLWin.glCanvas->Show(true);
|
|
||||||
if (GLWin.glCtxt == NULL) // XXX dirty hack
|
|
||||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
NSRect size;
|
|
||||||
NSUInteger style = NSMiniaturizableWindowMask;
|
|
||||||
NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
|
|
||||||
NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
|
|
||||||
initWithAttributes: attr];
|
|
||||||
if (fmt == nil) {
|
|
||||||
ERROR_LOG(VIDEO, "failed to create pixel format");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLWin.cocoaCtx = [[NSOpenGLContext alloc]
|
|
||||||
initWithFormat: fmt shareContext: nil];
|
|
||||||
[fmt release];
|
|
||||||
if (GLWin.cocoaCtx == nil) {
|
|
||||||
ERROR_LOG(VIDEO, "failed to create context");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
|
|
||||||
size = [[NSScreen mainScreen] frame];
|
|
||||||
style |= NSBorderlessWindowMask;
|
|
||||||
} else {
|
|
||||||
size = NSMakeRect(_tx, _ty, _twidth, _theight);
|
|
||||||
style |= NSResizableWindowMask | NSTitledWindowMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size
|
|
||||||
styleMask: style backing: NSBackingStoreBuffered defer: NO];
|
|
||||||
if (GLWin.cocoaWin == nil) {
|
|
||||||
ERROR_LOG(VIDEO, "failed to create window");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
|
|
||||||
CGDisplayCapture(CGMainDisplayID());
|
|
||||||
[GLWin.cocoaWin setLevel: CGShieldingWindowLevel()];
|
|
||||||
}
|
|
||||||
|
|
||||||
[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
|
|
||||||
[GLWin.cocoaWin makeKeyAndOrderFront: nil];
|
|
||||||
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait..."));
|
|
||||||
if (window_handle == NULL)
|
|
||||||
{
|
|
||||||
Host_SysMessage("failed to create window");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show the window
|
|
||||||
EmuWindow::Show();
|
|
||||||
|
|
||||||
PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be
|
|
||||||
{
|
|
||||||
sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor
|
|
||||||
1, // Version Number
|
|
||||||
PFD_DRAW_TO_WINDOW | // Format Must Support Window
|
|
||||||
PFD_SUPPORT_OPENGL | // Format Must Support OpenGL
|
|
||||||
PFD_DOUBLEBUFFER, // Must Support Double Buffering
|
|
||||||
PFD_TYPE_RGBA, // Request An RGBA Format
|
|
||||||
32, // Select Our Color Depth
|
|
||||||
0, 0, 0, 0, 0, 0, // Color Bits Ignored
|
|
||||||
0, // 8bit Alpha Buffer
|
|
||||||
0, // Shift Bit Ignored
|
|
||||||
0, // No Accumulation Buffer
|
|
||||||
0, 0, 0, 0, // Accumulation Bits Ignored
|
|
||||||
24, // 24Bit Z-Buffer (Depth Buffer)
|
|
||||||
8, // 8bit Stencil Buffer
|
|
||||||
0, // No Auxiliary Buffer
|
|
||||||
PFD_MAIN_PLANE, // Main Drawing Layer
|
|
||||||
0, // Reserved
|
|
||||||
0, 0, 0 // Layer Masks Ignored
|
|
||||||
};
|
|
||||||
|
|
||||||
GLuint PixelFormat; // Holds The Results After Searching For A Match
|
|
||||||
|
|
||||||
if (!(hDC=GetDC(EmuWindow::GetWnd()))) {
|
|
||||||
PanicAlert("(1) Can't create an OpenGL Device context. Fail.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) {
|
|
||||||
PanicAlert("(2) Can't find a suitable PixelFormat.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!SetPixelFormat(hDC, PixelFormat, &pfd)) {
|
|
||||||
PanicAlert("(3) Can't set the PixelFormat.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!(hRC = wglCreateContext(hDC))) {
|
|
||||||
PanicAlert("(4) Can't create an OpenGL rendering context.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
// --------------------------------------
|
|
||||||
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
int glxMajorVersion, glxMinorVersion;
|
|
||||||
|
|
||||||
// attributes for a single buffered visual in RGBA format with at least
|
|
||||||
// 8 bits per color and a 24 bit depth buffer
|
|
||||||
int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8,
|
|
||||||
GLX_GREEN_SIZE, 8,
|
|
||||||
GLX_BLUE_SIZE, 8,
|
|
||||||
GLX_DEPTH_SIZE, 24,
|
|
||||||
None};
|
|
||||||
|
|
||||||
// attributes for a double buffered visual in RGBA format with at least
|
|
||||||
// 8 bits per color and a 24 bit depth buffer
|
|
||||||
int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
|
|
||||||
GLX_RED_SIZE, 8,
|
|
||||||
GLX_GREEN_SIZE, 8,
|
|
||||||
GLX_BLUE_SIZE, 8,
|
|
||||||
GLX_DEPTH_SIZE, 24,
|
|
||||||
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0,
|
|
||||||
GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0,
|
|
||||||
None };
|
|
||||||
|
|
||||||
int attrListDefault[] = {
|
|
||||||
GLX_RGBA,
|
|
||||||
GLX_RED_SIZE, 1,
|
|
||||||
GLX_GREEN_SIZE, 1,
|
|
||||||
GLX_BLUE_SIZE, 1,
|
|
||||||
GLX_DOUBLEBUFFER,
|
|
||||||
GLX_DEPTH_SIZE, 1,
|
|
||||||
None };
|
|
||||||
|
|
||||||
GLWin.dpy = XOpenDisplay(0);
|
|
||||||
GLWin.evdpy = XOpenDisplay(0);
|
|
||||||
GLWin.parent = (Window)window_handle;
|
|
||||||
GLWin.screen = DefaultScreen(GLWin.dpy);
|
|
||||||
if (GLWin.parent == 0)
|
|
||||||
GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
|
|
||||||
|
|
||||||
glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion);
|
|
||||||
NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion);
|
|
||||||
|
|
||||||
// Get an appropriate visual
|
|
||||||
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl);
|
|
||||||
if (GLWin.vi == NULL)
|
|
||||||
{
|
|
||||||
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl);
|
|
||||||
if (GLWin.vi != NULL)
|
|
||||||
{
|
|
||||||
ERROR_LOG(VIDEO, "Only single buffered visual!");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault);
|
|
||||||
if (GLWin.vi == NULL)
|
|
||||||
{
|
|
||||||
ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
NOTICE_LOG(VIDEO, "Got double buffered visual!");
|
|
||||||
|
|
||||||
// Create a GLX context.
|
|
||||||
GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE);
|
|
||||||
if (!GLWin.ctx)
|
|
||||||
{
|
|
||||||
PanicAlert("Unable to create GLX context.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLWin.x = _tx;
|
|
||||||
GLWin.y = _ty;
|
|
||||||
GLWin.width = _twidth;
|
|
||||||
GLWin.height = _theight;
|
|
||||||
|
|
||||||
CreateXWindow();
|
|
||||||
window_handle = (void *)GLWin.win;
|
|
||||||
#endif
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool OpenGL_MakeCurrent()
|
|
||||||
{
|
|
||||||
// connect the glx-context to the window
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
[GLWin.cocoaCtx makeCurrentContext];
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
return wglMakeCurrent(hDC, hRC) ? true : false;
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
#if defined(HAVE_WX) && (HAVE_WX)
|
|
||||||
Host_GetRenderWindowSize(GLWin.x, GLWin.y,
|
|
||||||
(int&)GLWin.width, (int&)GLWin.height);
|
|
||||||
XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y,
|
|
||||||
GLWin.width, GLWin.height);
|
|
||||||
#endif
|
|
||||||
return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
|
|
||||||
#endif
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update window width, size and etc. Called from Render.cpp
|
|
||||||
void OpenGL_Update()
|
|
||||||
{
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
int width, height;
|
|
||||||
|
|
||||||
GLWin.panel->GetSize(&width, &height);
|
|
||||||
if (width == s_backbuffer_width && height == s_backbuffer_height)
|
|
||||||
return;
|
|
||||||
|
|
||||||
GLWin.glCanvas->SetFocus();
|
|
||||||
GLWin.glCanvas->SetSize(0, 0, width, height);
|
|
||||||
GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
|
|
||||||
s_backbuffer_width = width;
|
|
||||||
s_backbuffer_height = height;
|
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
int width, height;
|
|
||||||
|
|
||||||
width = [[GLWin.cocoaWin contentView] frame].size.width;
|
|
||||||
height = [[GLWin.cocoaWin contentView] frame].size.height;
|
|
||||||
if (width == s_backbuffer_width && height == s_backbuffer_height)
|
|
||||||
return;
|
|
||||||
|
|
||||||
[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
|
|
||||||
[GLWin.cocoaCtx update];
|
|
||||||
[GLWin.cocoaCtx makeCurrentContext];
|
|
||||||
s_backbuffer_width = width;
|
|
||||||
s_backbuffer_height = height;
|
|
||||||
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
RECT rcWindow;
|
|
||||||
if (!EmuWindow::GetParentWnd())
|
|
||||||
{
|
|
||||||
// We are not rendering to a child window - use client size.
|
|
||||||
GetClientRect(EmuWindow::GetWnd(), &rcWindow);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// We are rendering to a child window - use parent size.
|
|
||||||
GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the new window width and height
|
|
||||||
// See below for documentation
|
|
||||||
int width = rcWindow.right - rcWindow.left;
|
|
||||||
int height = rcWindow.bottom - rcWindow.top;
|
|
||||||
|
|
||||||
// If we are rendering to a child window
|
|
||||||
if (EmuWindow::GetParentWnd() != 0 &&
|
|
||||||
(s_backbuffer_width != width || s_backbuffer_height != height) &&
|
|
||||||
width >= 4 && height >= 4)
|
|
||||||
{
|
|
||||||
::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
|
|
||||||
s_backbuffer_width = width;
|
|
||||||
s_backbuffer_height = height;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close backend
|
|
||||||
void OpenGL_Shutdown()
|
|
||||||
{
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
GLWin.glCanvas->Hide();
|
|
||||||
// XXX GLWin.glCanvas->Destroy();
|
|
||||||
// XXX delete GLWin.glCtxt;
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
[GLWin.cocoaWin close];
|
|
||||||
[GLWin.cocoaCtx clearDrawable];
|
|
||||||
[GLWin.cocoaCtx release];
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
if (hRC)
|
|
||||||
{
|
|
||||||
if (!wglMakeCurrent(NULL, NULL))
|
|
||||||
NOTICE_LOG(VIDEO, "Could not release drawing context.");
|
|
||||||
|
|
||||||
if (!wglDeleteContext(hRC))
|
|
||||||
ERROR_LOG(VIDEO, "Release Rendering Context Failed.");
|
|
||||||
|
|
||||||
hRC = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
|
|
||||||
{
|
|
||||||
ERROR_LOG(VIDEO, "Release Device Context Failed.");
|
|
||||||
hDC = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
// compile vertex shader
|
||||||
DestroyXWindow();
|
glShaderSource(vertexShaderID, 1, &vertexShader, NULL);
|
||||||
if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL))
|
glCompileShader(vertexShaderID);
|
||||||
NOTICE_LOG(VIDEO, "Could not release drawing context.");
|
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
|
||||||
if (GLWin.ctx)
|
glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result);
|
||||||
{
|
glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer);
|
||||||
glXDestroyContext(GLWin.dpy, GLWin.ctx);
|
if(Result && stringBufferUsage) {
|
||||||
XCloseDisplay(GLWin.dpy);
|
ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader);
|
||||||
XCloseDisplay(GLWin.evdpy);
|
} else if(!Result) {
|
||||||
GLWin.ctx = NULL;
|
ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader);
|
||||||
|
} else {
|
||||||
|
DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader);
|
||||||
|
}
|
||||||
|
bool shader_errors = !Result;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// compile fragment shader
|
||||||
|
glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL);
|
||||||
|
glCompileShader(fragmentShaderID);
|
||||||
|
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
|
||||||
|
glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result);
|
||||||
|
glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer);
|
||||||
|
if(Result && stringBufferUsage) {
|
||||||
|
ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader);
|
||||||
|
} else if(!Result) {
|
||||||
|
ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader);
|
||||||
|
} else {
|
||||||
|
DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader);
|
||||||
|
}
|
||||||
|
shader_errors |= !Result;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// link them
|
||||||
|
glAttachShader(programID, vertexShaderID);
|
||||||
|
glAttachShader(programID, fragmentShaderID);
|
||||||
|
glLinkProgram(programID);
|
||||||
|
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
|
||||||
|
glGetProgramiv(programID, GL_LINK_STATUS, &Result);
|
||||||
|
glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer);
|
||||||
|
if(Result && stringBufferUsage) {
|
||||||
|
ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
|
||||||
|
} else if(!Result && !shader_errors) {
|
||||||
|
ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// cleanup
|
||||||
|
glDeleteShader(vertexShaderID);
|
||||||
|
glDeleteShader(fragmentShaderID);
|
||||||
|
|
||||||
|
return programID;
|
||||||
}
|
}
|
||||||
|
|
||||||
GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader )
|
GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader )
|
||||||
|
|
@ -697,14 +196,15 @@ GLuint OpenGL_ReportGLError(const char *function, const char *file, int line)
|
||||||
GLint err = glGetError();
|
GLint err = glGetError();
|
||||||
if (err != GL_NO_ERROR)
|
if (err != GL_NO_ERROR)
|
||||||
{
|
{
|
||||||
ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x - %s\n",
|
ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n",
|
||||||
file, line, function, err, gluErrorString(err));
|
file, line, function, err);
|
||||||
}
|
}
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenGL_ReportARBProgramError()
|
void OpenGL_ReportARBProgramError()
|
||||||
{
|
{
|
||||||
|
#ifndef USE_GLES
|
||||||
const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB);
|
const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB);
|
||||||
if (pstr != NULL && pstr[0] != 0)
|
if (pstr != NULL && pstr[0] != 0)
|
||||||
{
|
{
|
||||||
|
|
@ -714,10 +214,12 @@ void OpenGL_ReportARBProgramError()
|
||||||
ERROR_LOG(VIDEO, "%s", (char*)pstr);
|
ERROR_LOG(VIDEO, "%s", (char*)pstr);
|
||||||
ERROR_LOG(VIDEO, "\n");
|
ERROR_LOG(VIDEO, "\n");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
|
bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
|
||||||
{
|
{
|
||||||
|
#ifndef USE_GLES
|
||||||
unsigned int fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
|
unsigned int fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
|
||||||
if (fbo_status != GL_FRAMEBUFFER_COMPLETE_EXT)
|
if (fbo_status != GL_FRAMEBUFFER_COMPLETE_EXT)
|
||||||
{
|
{
|
||||||
|
|
@ -750,6 +252,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
|
||||||
file, line, function, error);
|
file, line, function, error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,26 +20,7 @@
|
||||||
|
|
||||||
#include "VideoConfig.h"
|
#include "VideoConfig.h"
|
||||||
#include "MathUtil.h"
|
#include "MathUtil.h"
|
||||||
#include "Thread.h"
|
#include "GLInterface.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define GLEW_STATIC
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include <GL/wglew.h>
|
|
||||||
#elif defined HAVE_X11 && HAVE_X11
|
|
||||||
#include <GL/glxew.h>
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/keysym.h>
|
|
||||||
#elif defined __APPLE__
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#import <AppKit/AppKit.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined USE_WX && USE_WX
|
|
||||||
#include "wx/wx.h"
|
|
||||||
#include "wx/glcanvas.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
|
#ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
|
||||||
#define GL_DEPTH_STENCIL_EXT 0x84F9
|
#define GL_DEPTH_STENCIL_EXT 0x84F9
|
||||||
|
|
@ -48,53 +29,28 @@
|
||||||
#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
|
#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_GLES
|
||||||
|
#define TEX2D GL_TEXTURE_2D
|
||||||
|
#define PREC "highp"
|
||||||
|
#define TEXTYPE "sampler2D"
|
||||||
|
#define TEXFUNC "texture2D"
|
||||||
|
#else
|
||||||
|
#define TEX2D GL_TEXTURE_RECTANGLE_ARB
|
||||||
|
#define PREC
|
||||||
|
#define TEXTYPE "sampler2DRect"
|
||||||
|
#define TEXFUNC "texture2DRect"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
#if defined(USE_WX) && USE_WX
|
|
||||||
wxGLCanvas *glCanvas;
|
|
||||||
wxGLContext *glCtxt;
|
|
||||||
wxPanel *panel;
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
NSWindow *cocoaWin;
|
|
||||||
NSOpenGLContext *cocoaCtx;
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
int screen;
|
|
||||||
Window win;
|
|
||||||
Window parent;
|
|
||||||
// dpy used for glx stuff, evdpy for window events etc.
|
|
||||||
// evdpy is to be used by XEventThread only
|
|
||||||
Display *dpy, *evdpy;
|
|
||||||
XVisualInfo *vi;
|
|
||||||
GLXContext ctx;
|
|
||||||
XSetWindowAttributes attr;
|
|
||||||
std::thread xEventThread;
|
|
||||||
int x, y;
|
|
||||||
unsigned int width, height;
|
|
||||||
#endif
|
#endif
|
||||||
} GLWindow;
|
void InitInterface();
|
||||||
|
|
||||||
extern GLWindow GLWin;
|
// Helpers
|
||||||
|
GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
|
||||||
#endif
|
|
||||||
|
|
||||||
// Public OpenGL util
|
|
||||||
|
|
||||||
// Initialization / upkeep
|
|
||||||
bool OpenGL_Create(void *&);
|
|
||||||
void OpenGL_Shutdown();
|
|
||||||
void OpenGL_Update();
|
|
||||||
bool OpenGL_MakeCurrent();
|
|
||||||
void OpenGL_SwapBuffers();
|
|
||||||
|
|
||||||
// Get status
|
|
||||||
u32 OpenGL_GetBackbufferWidth();
|
|
||||||
u32 OpenGL_GetBackbufferHeight();
|
|
||||||
|
|
||||||
// Set things
|
|
||||||
void OpenGL_SetWindowText(const char *text);
|
|
||||||
|
|
||||||
// Helpers
|
// Helpers
|
||||||
GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
|
GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
|
||||||
|
|
|
||||||
|
|
@ -343,8 +343,8 @@ Renderer::Renderer()
|
||||||
return; // TODO: fail
|
return; // TODO: fail
|
||||||
|
|
||||||
// Decide frambuffer size
|
// Decide frambuffer size
|
||||||
s_backbuffer_width = (int)OpenGL_GetBackbufferWidth();
|
s_backbuffer_width = (int)GLInterface->GetBackBufferWidth();
|
||||||
s_backbuffer_height = (int)OpenGL_GetBackbufferHeight();
|
s_backbuffer_height = (int)GLInterface->GetBackBufferHeight();
|
||||||
|
|
||||||
// Handle VSync on/off
|
// Handle VSync on/off
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
|
@ -572,7 +572,7 @@ Renderer::~Renderer()
|
||||||
void Renderer::DrawDebugInfo()
|
void Renderer::DrawDebugInfo()
|
||||||
{
|
{
|
||||||
// Reset viewport for drawing text
|
// Reset viewport for drawing text
|
||||||
glViewport(0, 0, OpenGL_GetBackbufferWidth(), OpenGL_GetBackbufferHeight());
|
glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
|
||||||
// Draw various messages on the screen, like FPS, statistics, etc.
|
// Draw various messages on the screen, like FPS, statistics, etc.
|
||||||
char debugtext_buffer[8192];
|
char debugtext_buffer[8192];
|
||||||
char *p = debugtext_buffer;
|
char *p = debugtext_buffer;
|
||||||
|
|
@ -730,8 +730,8 @@ void Renderer::DrawDebugInfo()
|
||||||
|
|
||||||
void Renderer::RenderText(const char *text, int left, int top, u32 color)
|
void Renderer::RenderText(const char *text, int left, int top, u32 color)
|
||||||
{
|
{
|
||||||
const int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth();
|
const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
|
||||||
const int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight();
|
const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
|
||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
@ -1429,7 +1429,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
|
||||||
|
|
||||||
SetWindowSize(fbWidth, fbHeight);
|
SetWindowSize(fbWidth, fbHeight);
|
||||||
|
|
||||||
OpenGL_Update(); // just updates the render window position and the backbuffer size
|
GLInterface->Update(); // just updates the render window position and the backbuffer size
|
||||||
|
|
||||||
bool xfbchanged = false;
|
bool xfbchanged = false;
|
||||||
|
|
||||||
|
|
@ -1443,8 +1443,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WindowResized = false;
|
bool WindowResized = false;
|
||||||
int W = (int)OpenGL_GetBackbufferWidth();
|
int W = (int)GLInterface->GetBackBufferWidth();
|
||||||
int H = (int)OpenGL_GetBackbufferHeight();
|
int H = (int)GLInterface->GetBackBufferHeight();
|
||||||
if (W != s_backbuffer_width || H != s_backbuffer_height || s_LastEFBScale != g_ActiveConfig.iEFBScale)
|
if (W != s_backbuffer_width || H != s_backbuffer_height || s_LastEFBScale != g_ActiveConfig.iEFBScale)
|
||||||
{
|
{
|
||||||
WindowResized = true;
|
WindowResized = true;
|
||||||
|
|
@ -1489,7 +1489,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
|
||||||
GL_REPORT_ERRORD();
|
GL_REPORT_ERRORD();
|
||||||
|
|
||||||
// Copy the rendered frame to the real window
|
// Copy the rendered frame to the real window
|
||||||
OpenGL_SwapBuffers();
|
GLInterface->Swap();
|
||||||
|
|
||||||
GL_REPORT_ERRORD();
|
GL_REPORT_ERRORD();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,8 @@ bool VideoBackend::Initialize(void *&window_handle)
|
||||||
g_Config.VerifyValidity();
|
g_Config.VerifyValidity();
|
||||||
UpdateActiveConfig();
|
UpdateActiveConfig();
|
||||||
|
|
||||||
if (!OpenGL_Create(window_handle))
|
InitInterface();
|
||||||
|
if (!GLInterface->Create(window_handle))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
s_BackendInitialized = true;
|
s_BackendInitialized = true;
|
||||||
|
|
@ -177,7 +178,7 @@ bool VideoBackend::Initialize(void *&window_handle)
|
||||||
// Run from the graphics thread
|
// Run from the graphics thread
|
||||||
void VideoBackend::Video_Prepare()
|
void VideoBackend::Video_Prepare()
|
||||||
{
|
{
|
||||||
OpenGL_MakeCurrent();
|
GLInterface->MakeCurrent();
|
||||||
|
|
||||||
g_renderer = new Renderer;
|
g_renderer = new Renderer;
|
||||||
|
|
||||||
|
|
@ -236,7 +237,7 @@ void VideoBackend::Shutdown()
|
||||||
g_renderer = NULL;
|
g_renderer = NULL;
|
||||||
g_texture_cache = NULL;
|
g_texture_cache = NULL;
|
||||||
}
|
}
|
||||||
OpenGL_Shutdown();
|
GLInterface->Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,13 +26,25 @@ if(wxWidgets_FOUND)
|
||||||
endif(wxWidgets_FOUND)
|
endif(wxWidgets_FOUND)
|
||||||
|
|
||||||
set(LIBS videocommon
|
set(LIBS videocommon
|
||||||
GLEW
|
|
||||||
SOIL
|
SOIL
|
||||||
common
|
common
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${X11_LIBRARIES}
|
${X11_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES})
|
${wxWidgets_LIBRARIES})
|
||||||
|
if(USE_EGL)
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
EGL)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(USE_GLES)
|
||||||
|
set(SRCS ${SRCS}
|
||||||
|
../Plugin_VideoOGL/Src/GLUtil.cpp)
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
GLESv2)
|
||||||
|
else()
|
||||||
|
set(LIBS ${LIBS}
|
||||||
|
GLEW
|
||||||
|
${OPENGL_LIBRARIES})
|
||||||
|
endif()
|
||||||
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
|
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
|
||||||
set(LIBS ${LIBS} clrun)
|
set(LIBS ${LIBS} clrun)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
#include "DebugUtil.h"
|
#include "DebugUtil.h"
|
||||||
#include "HwRasterizer.h"
|
#include "HwRasterizer.h"
|
||||||
#include "SWCommandProcessor.h"
|
#include "SWCommandProcessor.h"
|
||||||
#include "../../Plugin_VideoOGL/Src/GLUtil.h"
|
|
||||||
#include "HW/Memmap.h"
|
#include "HW/Memmap.h"
|
||||||
#include "Core.h"
|
#include "Core.h"
|
||||||
|
|
||||||
|
|
@ -33,7 +32,7 @@ namespace EfbCopy
|
||||||
{
|
{
|
||||||
void CopyToXfb()
|
void CopyToXfb()
|
||||||
{
|
{
|
||||||
OpenGL_Update(); // just updates the render window position and the backbuffer size
|
GLInterface->Update(); // just updates the render window position and the backbuffer size
|
||||||
|
|
||||||
if (!g_SWVideoConfig.bHwRasterizer)
|
if (!g_SWVideoConfig.bHwRasterizer)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -29,163 +29,354 @@
|
||||||
|
|
||||||
namespace HwRasterizer
|
namespace HwRasterizer
|
||||||
{
|
{
|
||||||
float efbHalfWidth;
|
float efbHalfWidth;
|
||||||
float efbHalfHeight;
|
float efbHalfHeight;
|
||||||
bool hasTexture;
|
bool hasTexture;
|
||||||
|
|
||||||
u8 *temp;
|
u8 *temp;
|
||||||
|
|
||||||
void Init()
|
// Programs
|
||||||
{
|
static GLuint colProg, texProg, clearProg;
|
||||||
efbHalfWidth = EFB_WIDTH / 2.0f;
|
|
||||||
efbHalfHeight = 480 / 2.0f;
|
|
||||||
|
|
||||||
temp = (u8*)AllocateMemoryPages(TEMP_SIZE);
|
// Color
|
||||||
}
|
static GLint col_apos = -1, col_atex = -1;
|
||||||
|
// Tex
|
||||||
|
static GLint tex_apos = -1, tex_atex = -1, tex_utex = -1;
|
||||||
|
// Clear shader
|
||||||
|
static GLint clear_apos = -1, clear_ucol = -1;
|
||||||
|
|
||||||
void LoadTexture()
|
void CreateShaders()
|
||||||
{
|
{
|
||||||
FourTexUnits &texUnit = bpmem.tex[0];
|
// Color Vertices
|
||||||
u32 imageAddr = texUnit.texImage3[0].image_base;
|
static const char *fragcolText =
|
||||||
|
"varying " PREC " vec4 TexCoordOut;\n"
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_FragColor = TexCoordOut;\n"
|
||||||
|
"}\n";
|
||||||
|
// Texture Vertices
|
||||||
|
static const char *fragtexText =
|
||||||
|
"varying " PREC " vec4 TexCoordOut;\n"
|
||||||
|
"uniform " TEXTYPE " Texture;\n"
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_FragColor = " TEXFUNC "(Texture, TexCoordOut.xy);\n"
|
||||||
|
"}\n";
|
||||||
|
// Clear shader
|
||||||
|
static const char *fragclearText =
|
||||||
|
"uniform vec4 Color;\n"
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_FragColor = Color;\n"
|
||||||
|
"}\n";
|
||||||
|
// Generic passthrough vertice shaders
|
||||||
|
static const char *vertShaderText =
|
||||||
|
"attribute vec4 pos;\n"
|
||||||
|
"attribute vec4 TexCoordIn;\n "
|
||||||
|
"varying vec4 TexCoordOut;\n "
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_Position = pos;\n"
|
||||||
|
" TexCoordOut = TexCoordIn;\n"
|
||||||
|
"}\n";
|
||||||
|
static const char *vertclearText =
|
||||||
|
"attribute vec4 pos;\n"
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_Position = pos;\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
TexCacheEntry &cacheEntry = textures[imageAddr];
|
// Color Program
|
||||||
cacheEntry.Update();
|
colProg = OpenGL_CompileProgram(vertShaderText, fragcolText);
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, cacheEntry.texture);
|
// Texture Program
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
|
texProg = OpenGL_CompileProgram(vertShaderText, fragtexText);
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BeginTriangles()
|
// Clear Program
|
||||||
{
|
clearProg = OpenGL_CompileProgram(vertclearText, fragclearText);
|
||||||
// disabling depth test sometimes allows more things to be visible
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
|
||||||
glEnable(GL_BLEND);
|
|
||||||
|
|
||||||
hasTexture = bpmem.tevorders[0].enable0;
|
// Color attributes
|
||||||
|
col_apos = glGetAttribLocation(colProg, "pos");
|
||||||
|
col_atex = glGetAttribLocation(colProg, "TexCoordIn");
|
||||||
|
// Texture attributes
|
||||||
|
tex_apos = glGetAttribLocation(texProg, "pos");
|
||||||
|
tex_atex = glGetAttribLocation(texProg, "TexCoordIn");
|
||||||
|
tex_utex = glGetUniformLocation(texProg, "Texture");
|
||||||
|
// Clear attributes
|
||||||
|
clear_apos = glGetAttribLocation(clearProg, "pos");
|
||||||
|
clear_ucol = glGetUniformLocation(clearProg, "Color");
|
||||||
|
}
|
||||||
|
|
||||||
if (hasTexture)
|
void Init()
|
||||||
LoadTexture();
|
{
|
||||||
}
|
efbHalfWidth = EFB_WIDTH / 2.0f;
|
||||||
|
efbHalfHeight = 480 / 2.0f;
|
||||||
|
|
||||||
void EndTriangles()
|
temp = (u8*)AllocateMemoryPages(TEMP_SIZE);
|
||||||
{
|
}
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
void Shutdown()
|
||||||
|
{
|
||||||
|
glDeleteProgram(colProg);
|
||||||
|
glDeleteProgram(texProg);
|
||||||
|
glDeleteProgram(clearProg);
|
||||||
|
}
|
||||||
|
void Prepare()
|
||||||
|
{
|
||||||
|
//legacy multitexturing: select texture channel only.
|
||||||
|
glActiveTexture(GL_TEXTURE0);
|
||||||
|
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment
|
||||||
|
#ifndef USE_GLES
|
||||||
|
glShadeModel(GL_SMOOTH);
|
||||||
|
glDisable(GL_BLEND);
|
||||||
|
glClearDepth(1.0f);
|
||||||
|
glEnable(GL_SCISSOR_TEST);
|
||||||
|
glDisable(GL_LIGHTING);
|
||||||
|
glMatrixMode(GL_PROJECTION);
|
||||||
|
glLoadIdentity();
|
||||||
|
glMatrixMode(GL_MODELVIEW);
|
||||||
|
glLoadIdentity();
|
||||||
|
|
||||||
glDisable(GL_DEPTH_TEST);
|
glClientActiveTexture(GL_TEXTURE0);
|
||||||
glDisable(GL_BLEND);
|
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
||||||
}
|
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
||||||
|
glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
glStencilFunc(GL_ALWAYS, 0, 0);
|
||||||
|
glDisable(GL_STENCIL_TEST);
|
||||||
|
#endif
|
||||||
|
// used by hw rasterizer if it enables blending and depth test
|
||||||
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
glDepthFunc(GL_LEQUAL);
|
||||||
|
|
||||||
void DrawColorVertex(OutputVertexData *v)
|
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
{
|
|
||||||
glColor3ub(v->color[0][OutputVertexData::RED_C], v->color[0][OutputVertexData::GRN_C], v->color[0][OutputVertexData::BLU_C]);
|
CreateShaders();
|
||||||
glVertex3f(v->screenPosition.x / efbHalfWidth - 1.0f, 1.0f - v->screenPosition.y / efbHalfHeight, v->screenPosition.z / (float)0x00ffffff);
|
GL_REPORT_ERRORD();
|
||||||
}
|
}
|
||||||
|
static float width, height;
|
||||||
|
void LoadTexture()
|
||||||
|
{
|
||||||
|
FourTexUnits &texUnit = bpmem.tex[0];
|
||||||
|
u32 imageAddr = texUnit.texImage3[0].image_base;
|
||||||
|
// Texture Rectangle uses pixel coordinates
|
||||||
|
// While GLES uses texture coordinates
|
||||||
|
#ifdef USE_GLES
|
||||||
|
width = texUnit.texImage0[0].width;
|
||||||
|
height = texUnit.texImage0[0].height;
|
||||||
|
#else
|
||||||
|
width = 1;
|
||||||
|
height = 1;
|
||||||
|
#endif
|
||||||
|
TexCacheEntry &cacheEntry = textures[imageAddr];
|
||||||
|
cacheEntry.Update();
|
||||||
|
|
||||||
void DrawTextureVertex(OutputVertexData *v)
|
glBindTexture(TEX2D, cacheEntry.texture);
|
||||||
{
|
glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
|
||||||
float s = v->texCoords[0].x;
|
glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
|
||||||
float t = v->texCoords[0].y;
|
GL_REPORT_ERRORD();
|
||||||
glTexCoord2f(s, t);
|
}
|
||||||
|
|
||||||
float x = (v->screenPosition.x / efbHalfWidth) - 1.0f;
|
void BeginTriangles()
|
||||||
float y = 1.0f - (v->screenPosition.y / efbHalfHeight);
|
{
|
||||||
float z = v->screenPosition.z;
|
// disabling depth test sometimes allows more things to be visible
|
||||||
glVertex3f(x, y, z);
|
glEnable(GL_DEPTH_TEST);
|
||||||
}
|
glEnable(GL_BLEND);
|
||||||
|
|
||||||
void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
|
hasTexture = bpmem.tevorders[0].enable0;
|
||||||
{
|
|
||||||
glBegin(GL_TRIANGLES);
|
|
||||||
if (hasTexture)
|
|
||||||
{
|
|
||||||
DrawTextureVertex(v0);
|
|
||||||
DrawTextureVertex(v1);
|
|
||||||
DrawTextureVertex(v2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DrawColorVertex(v0);
|
|
||||||
DrawColorVertex(v1);
|
|
||||||
DrawColorVertex(v2);
|
|
||||||
}
|
|
||||||
glEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Clear()
|
if (hasTexture)
|
||||||
{
|
LoadTexture();
|
||||||
u8 r = (bpmem.clearcolorAR & 0x00ff);
|
}
|
||||||
u8 g = (bpmem.clearcolorGB & 0xff00) >> 8;
|
|
||||||
u8 b = (bpmem.clearcolorGB & 0x00ff);
|
|
||||||
u8 a = (bpmem.clearcolorAR & 0xff00) >> 8;
|
|
||||||
|
|
||||||
GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f;
|
void EndTriangles()
|
||||||
GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight;
|
{
|
||||||
GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f;
|
glBindTexture(TEX2D, 0);
|
||||||
GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight;
|
glDisable(GL_DEPTH_TEST);
|
||||||
GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff;
|
glDisable(GL_BLEND);
|
||||||
|
}
|
||||||
|
|
||||||
glBegin(GL_QUADS);
|
void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
|
||||||
glColor4ub(r, g, b, a);
|
{
|
||||||
glVertex3f(left, top, depth);
|
float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
glColor4ub(r, g, b, a);
|
float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
|
||||||
glVertex3f(right, top, depth);
|
float z0 = v0->screenPosition.z / (float)0x00ffffff;
|
||||||
glColor4ub(r, g, b, a);
|
|
||||||
glVertex3f(right, bottom, depth);
|
|
||||||
glColor4ub(r, g, b, a);
|
|
||||||
glVertex3f(left, bottom, depth);
|
|
||||||
glEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
TexCacheEntry::TexCacheEntry()
|
float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
{
|
float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
|
||||||
Create();
|
float z1 = v1->screenPosition.z / (float)0x00ffffff;
|
||||||
}
|
|
||||||
|
|
||||||
void TexCacheEntry::Create()
|
float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
{
|
float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
|
||||||
FourTexUnits &texUnit = bpmem.tex[0];
|
float z2 = v2->screenPosition.z / (float)0x00ffffff;
|
||||||
|
|
||||||
texImage0.hex = texUnit.texImage0[0].hex;
|
float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f;
|
||||||
texImage1.hex = texUnit.texImage1[0].hex;
|
float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f;
|
||||||
texImage2.hex = texUnit.texImage2[0].hex;
|
float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f;
|
||||||
texImage3.hex = texUnit.texImage3[0].hex;
|
|
||||||
texTlut.hex = texUnit.texTlut[0].hex;
|
|
||||||
|
|
||||||
int width = texImage0.width;
|
float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f;
|
||||||
int height = texImage0.height;
|
float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f;
|
||||||
|
float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f;
|
||||||
|
|
||||||
DebugUtil::GetTextureBGRA(temp, 0, 0, width, height);
|
float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f;
|
||||||
|
float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f;
|
||||||
|
float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f;
|
||||||
|
|
||||||
glGenTextures(1, (GLuint *)&texture);
|
static const GLfloat verts[3][3] = {
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
|
{ x0, y0, z0 },
|
||||||
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp);
|
{ x1, y1, z1 },
|
||||||
}
|
{ x2, y2, z2 }
|
||||||
|
};
|
||||||
|
static const GLfloat col[3][4] = {
|
||||||
|
{ r0, g0, b0, 1.0f },
|
||||||
|
{ r1, g1, b1, 1.0f },
|
||||||
|
{ r2, g2, b2, 1.0f }
|
||||||
|
};
|
||||||
|
{
|
||||||
|
glUseProgram(colProg);
|
||||||
|
glEnableVertexAttribArray(col_apos);
|
||||||
|
glEnableVertexAttribArray(col_atex);
|
||||||
|
|
||||||
void TexCacheEntry::Destroy()
|
glVertexAttribPointer(col_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
|
||||||
{
|
glVertexAttribPointer(col_atex, 4, GL_FLOAT, GL_FALSE, 0, col);
|
||||||
if (texture == 0)
|
glDrawArrays(GL_TRIANGLES, 0, 3);
|
||||||
return;
|
glDisableVertexAttribArray(col_atex);
|
||||||
|
glDisableVertexAttribArray(col_apos);
|
||||||
|
}
|
||||||
|
GL_REPORT_ERRORD();
|
||||||
|
}
|
||||||
|
|
||||||
glDeleteTextures(1, &texture);
|
void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
|
||||||
texture = 0;
|
{
|
||||||
}
|
float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
|
float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
|
||||||
|
float z0 = v0->screenPosition.z;
|
||||||
|
|
||||||
void TexCacheEntry::Update()
|
float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
{
|
float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
|
||||||
FourTexUnits &texUnit = bpmem.tex[0];
|
float z1 = v1->screenPosition.z;
|
||||||
|
|
||||||
// extra checks cause textures to be reloaded much more
|
float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
|
||||||
if (texUnit.texImage0[0].hex != texImage0.hex ||
|
float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
|
||||||
//texUnit.texImage1[0].hex != texImage1.hex ||
|
float z2 = v2->screenPosition.z;
|
||||||
//texUnit.texImage2[0].hex != texImage2.hex ||
|
|
||||||
texUnit.texImage3[0].hex != texImage3.hex ||
|
|
||||||
texUnit.texTlut[0].hex != texTlut.hex)
|
|
||||||
{
|
|
||||||
Destroy();
|
|
||||||
Create();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
float s0 = v0->texCoords[0].x / width;
|
||||||
|
float t0 = v0->texCoords[0].y / height;
|
||||||
|
|
||||||
|
float s1 = v1->texCoords[0].x / width;
|
||||||
|
float t1 = v1->texCoords[0].y / height;
|
||||||
|
|
||||||
|
float s2 = v2->texCoords[0].x / width;
|
||||||
|
float t2 = v2->texCoords[0].y / height;
|
||||||
|
|
||||||
|
static const GLfloat verts[3][3] = {
|
||||||
|
{ x0, y0, z0 },
|
||||||
|
{ x1, y1, z1 },
|
||||||
|
{ x2, y2, z2 }
|
||||||
|
};
|
||||||
|
static const GLfloat tex[3][2] = {
|
||||||
|
{ s0, t0 },
|
||||||
|
{ s1, t1 },
|
||||||
|
{ s2, t2 }
|
||||||
|
};
|
||||||
|
{
|
||||||
|
glUseProgram(texProg);
|
||||||
|
glEnableVertexAttribArray(tex_apos);
|
||||||
|
glEnableVertexAttribArray(tex_atex);
|
||||||
|
|
||||||
|
glVertexAttribPointer(tex_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
|
||||||
|
glVertexAttribPointer(tex_atex, 2, GL_FLOAT, GL_FALSE, 0, tex);
|
||||||
|
glUniform1i(tex_utex, 0);
|
||||||
|
glDrawArrays(GL_TRIANGLES, 0, 3);
|
||||||
|
glDisableVertexAttribArray(tex_atex);
|
||||||
|
glDisableVertexAttribArray(tex_apos);
|
||||||
|
}
|
||||||
|
GL_REPORT_ERRORD();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
|
||||||
|
{
|
||||||
|
if (hasTexture)
|
||||||
|
DrawTextureVertex(v0, v1, v2);
|
||||||
|
else
|
||||||
|
DrawColorVertex(v0, v1, v2);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Clear()
|
||||||
|
{
|
||||||
|
u8 r = (bpmem.clearcolorAR & 0x00ff);
|
||||||
|
u8 g = (bpmem.clearcolorGB & 0xff00) >> 8;
|
||||||
|
u8 b = (bpmem.clearcolorGB & 0x00ff);
|
||||||
|
u8 a = (bpmem.clearcolorAR & 0xff00) >> 8;
|
||||||
|
|
||||||
|
GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f;
|
||||||
|
GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight;
|
||||||
|
GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f;
|
||||||
|
GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight;
|
||||||
|
GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff;
|
||||||
|
static const GLfloat verts[4][3] = {
|
||||||
|
{ left, top, depth },
|
||||||
|
{ right, top, depth },
|
||||||
|
{ right, bottom, depth },
|
||||||
|
{ left, bottom, depth }
|
||||||
|
};
|
||||||
|
{
|
||||||
|
glUseProgram(clearProg);
|
||||||
|
glVertexAttribPointer(clear_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
|
||||||
|
glUniform4f(clear_ucol, r, g, b, a);
|
||||||
|
glEnableVertexAttribArray(col_apos);
|
||||||
|
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
||||||
|
glDisableVertexAttribArray(col_apos);
|
||||||
|
}
|
||||||
|
GL_REPORT_ERRORD();
|
||||||
|
}
|
||||||
|
|
||||||
|
TexCacheEntry::TexCacheEntry()
|
||||||
|
{
|
||||||
|
Create();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TexCacheEntry::Create()
|
||||||
|
{
|
||||||
|
FourTexUnits &texUnit = bpmem.tex[0];
|
||||||
|
|
||||||
|
texImage0.hex = texUnit.texImage0[0].hex;
|
||||||
|
texImage1.hex = texUnit.texImage1[0].hex;
|
||||||
|
texImage2.hex = texUnit.texImage2[0].hex;
|
||||||
|
texImage3.hex = texUnit.texImage3[0].hex;
|
||||||
|
texTlut.hex = texUnit.texTlut[0].hex;
|
||||||
|
|
||||||
|
int width = texImage0.width;
|
||||||
|
int height = texImage0.height;
|
||||||
|
|
||||||
|
DebugUtil::GetTextureBGRA(temp, 0, 0, width, height);
|
||||||
|
|
||||||
|
glGenTextures(1, (GLuint *)&texture);
|
||||||
|
glBindTexture(TEX2D, texture);
|
||||||
|
#ifdef USE_GLES
|
||||||
|
glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
|
||||||
|
#else
|
||||||
|
glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp);
|
||||||
|
#endif
|
||||||
|
GL_REPORT_ERRORD();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TexCacheEntry::Destroy()
|
||||||
|
{
|
||||||
|
if (texture == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
glDeleteTextures(1, &texture);
|
||||||
|
texture = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TexCacheEntry::Update()
|
||||||
|
{
|
||||||
|
FourTexUnits &texUnit = bpmem.tex[0];
|
||||||
|
|
||||||
|
// extra checks cause textures to be reloaded much more
|
||||||
|
if (texUnit.texImage0[0].hex != texImage0.hex ||
|
||||||
|
//texUnit.texImage1[0].hex != texImage1.hex ||
|
||||||
|
//texUnit.texImage2[0].hex != texImage2.hex ||
|
||||||
|
texUnit.texImage3[0].hex != texImage3.hex ||
|
||||||
|
texUnit.texTlut[0].hex != texTlut.hex)
|
||||||
|
{
|
||||||
|
Destroy();
|
||||||
|
Create();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@ struct OutputVertexData;
|
||||||
namespace HwRasterizer
|
namespace HwRasterizer
|
||||||
{
|
{
|
||||||
void Init();
|
void Init();
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
void Prepare();
|
||||||
|
|
||||||
void BeginTriangles();
|
void BeginTriangles();
|
||||||
void EndTriangles();
|
void EndTriangles();
|
||||||
|
|
|
||||||
|
|
@ -16,17 +16,23 @@
|
||||||
// http://code.google.com/p/dolphin-emu/
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
#include "../../Plugin_VideoOGL/Src/GLUtil.h"
|
#include "../../Plugin_VideoOGL/Src/GLUtil.h"
|
||||||
|
#include "../../Plugin_VideoOGL/Src/RasterFont.h"
|
||||||
#include "SWRenderer.h"
|
#include "SWRenderer.h"
|
||||||
#include "SWStatistics.h"
|
#include "SWStatistics.h"
|
||||||
#include "../../Plugin_VideoOGL/Src/RasterFont.h"
|
|
||||||
|
|
||||||
#define VSYNC_ENABLED 0
|
|
||||||
|
|
||||||
static GLuint s_RenderTarget = 0;
|
static GLuint s_RenderTarget = 0;
|
||||||
|
|
||||||
|
static GLint attr_pos = -1, attr_tex = -1;
|
||||||
|
static GLint uni_tex = -1;
|
||||||
|
static GLuint program;
|
||||||
|
|
||||||
|
// Rasterfont isn't compatible with GLES
|
||||||
|
#ifndef USE_GLES
|
||||||
RasterFont* s_pfont = NULL;
|
RasterFont* s_pfont = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
void SWRenderer::Init()
|
void SWRenderer::Init()
|
||||||
{
|
{
|
||||||
|
|
@ -34,71 +40,60 @@ void SWRenderer::Init()
|
||||||
|
|
||||||
void SWRenderer::Shutdown()
|
void SWRenderer::Shutdown()
|
||||||
{
|
{
|
||||||
glDeleteTextures(1, &s_RenderTarget);
|
glDeleteProgram(program);
|
||||||
|
glDeleteTextures(1, &s_RenderTarget);
|
||||||
|
#ifndef USE_GLES
|
||||||
|
delete s_pfont;
|
||||||
|
s_pfont = 0;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
delete s_pfont;
|
void CreateShaders()
|
||||||
s_pfont = 0;
|
{
|
||||||
|
static const char *fragShaderText =
|
||||||
|
"varying " PREC " vec2 TexCoordOut;\n"
|
||||||
|
"uniform " TEXTYPE " Texture;\n"
|
||||||
|
"void main() {\n"
|
||||||
|
" " PREC " vec4 tmpcolor;\n"
|
||||||
|
" tmpcolor = " TEXFUNC "(Texture, TexCoordOut);\n"
|
||||||
|
" gl_FragColor = tmpcolor;\n"
|
||||||
|
"}\n";
|
||||||
|
static const char *vertShaderText =
|
||||||
|
"attribute vec4 pos;\n"
|
||||||
|
"attribute vec2 TexCoordIn;\n "
|
||||||
|
"varying vec2 TexCoordOut;\n "
|
||||||
|
"void main() {\n"
|
||||||
|
" gl_Position = pos;\n"
|
||||||
|
" TexCoordOut = TexCoordIn;\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
program = OpenGL_CompileProgram(vertShaderText, fragShaderText);
|
||||||
|
|
||||||
|
glUseProgram(program);
|
||||||
|
|
||||||
|
uni_tex = glGetUniformLocation(program, "Texture");
|
||||||
|
attr_pos = glGetAttribLocation(program, "pos");
|
||||||
|
attr_tex = glGetAttribLocation(program, "TexCoordIn");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SWRenderer::Prepare()
|
void SWRenderer::Prepare()
|
||||||
{
|
{
|
||||||
OpenGL_MakeCurrent();
|
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
|
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment
|
||||||
|
glGenTextures(1, &s_RenderTarget);
|
||||||
|
|
||||||
// Init extension support.
|
CreateShaders();
|
||||||
if (glewInit() != GLEW_OK) {
|
// TODO: Enable for GLES once RasterFont supports GLES
|
||||||
ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?");
|
#ifndef USE_GLES
|
||||||
return;
|
s_pfont = new RasterFont();
|
||||||
}
|
|
||||||
|
|
||||||
// Handle VSync on/off
|
|
||||||
#ifdef _WIN32
|
|
||||||
if (WGLEW_EXT_swap_control)
|
|
||||||
wglSwapIntervalEXT(VSYNC_ENABLED);
|
|
||||||
else
|
|
||||||
ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?");
|
|
||||||
#elif defined(HAVE_X11) && HAVE_X11
|
|
||||||
if (glXSwapIntervalSGI)
|
|
||||||
glXSwapIntervalSGI(VSYNC_ENABLED);
|
|
||||||
else
|
|
||||||
ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glStencilFunc(GL_ALWAYS, 0, 0);
|
|
||||||
// used by hw rasterizer if it enables blending and depth test
|
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
glDepthFunc(GL_LEQUAL);
|
|
||||||
|
|
||||||
glShadeModel(GL_SMOOTH);
|
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
|
||||||
glClearDepth(1.0f);
|
|
||||||
glEnable(GL_SCISSOR_TEST);
|
|
||||||
|
|
||||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment
|
|
||||||
|
|
||||||
glDisable(GL_LIGHTING);
|
|
||||||
glDisable(GL_BLEND);
|
|
||||||
glDisable(GL_STENCIL_TEST);
|
|
||||||
//glDisable(GL_SCISSOR_TEST);
|
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
|
||||||
glLoadIdentity();
|
|
||||||
glMatrixMode(GL_MODELVIEW);
|
|
||||||
glLoadIdentity();
|
|
||||||
|
|
||||||
s_pfont = new RasterFont();
|
|
||||||
|
|
||||||
// legacy multitexturing: select texture channel only.
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glClientActiveTexture(GL_TEXTURE0);
|
|
||||||
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
|
||||||
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
|
||||||
|
|
||||||
glGenTextures(1, &s_RenderTarget);
|
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
#endif
|
||||||
|
GL_REPORT_ERRORD();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
|
void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
|
||||||
{
|
{
|
||||||
|
#ifndef USE_GLES
|
||||||
int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth();
|
int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth();
|
||||||
int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight();
|
int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight();
|
||||||
|
|
||||||
|
|
@ -106,11 +101,12 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
|
||||||
left * 2.0f / (float)nBackbufferWidth - 1,
|
left * 2.0f / (float)nBackbufferWidth - 1,
|
||||||
1 - top * 2.0f / (float)nBackbufferHeight,
|
1 - top * 2.0f / (float)nBackbufferHeight,
|
||||||
0, nBackbufferWidth, nBackbufferHeight, color);
|
0, nBackbufferWidth, nBackbufferHeight, color);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void SWRenderer::DrawDebugText()
|
void SWRenderer::DrawDebugText()
|
||||||
{
|
{
|
||||||
char debugtext_buffer[8192];
|
char debugtext_buffer[8192];
|
||||||
char *p = debugtext_buffer;
|
char *p = debugtext_buffer;
|
||||||
p[0] = 0;
|
p[0] = 0;
|
||||||
|
|
||||||
|
|
@ -138,48 +134,71 @@ void SWRenderer::DrawDebugText()
|
||||||
|
|
||||||
void SWRenderer::DrawTexture(u8 *texture, int width, int height)
|
void SWRenderer::DrawTexture(u8 *texture, int width, int height)
|
||||||
{
|
{
|
||||||
GLsizei glWidth = (GLsizei)OpenGL_GetBackbufferWidth();
|
GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth();
|
||||||
GLsizei glHeight = (GLsizei)OpenGL_GetBackbufferHeight();
|
GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight();
|
||||||
|
|
||||||
// Update GLViewPort
|
// Update GLViewPort
|
||||||
glViewport(0, 0, glWidth, glHeight);
|
glViewport(0, 0, glWidth, glHeight);
|
||||||
glScissor(0, 0, glWidth, glHeight);
|
glScissor(0, 0, glWidth, glHeight);
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, s_RenderTarget);
|
glBindTexture(TEX2D, s_RenderTarget);
|
||||||
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
|
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
||||||
|
|
||||||
|
glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
|
||||||
|
glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
|
glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||||
|
|
||||||
|
GLfloat u_max = (GLfloat)width;
|
||||||
|
GLfloat v_max = (GLfloat)glHeight;
|
||||||
|
|
||||||
|
static const GLfloat verts[4][2] = {
|
||||||
|
{ -1, -1}, // Left top
|
||||||
|
{ -1, 1}, // left bottom
|
||||||
|
{ 1, 1}, // right bottom
|
||||||
|
{ 1, -1} // right top
|
||||||
|
};
|
||||||
|
//Texture rectangle uses pixel coordinates
|
||||||
|
#ifndef USE_GLES
|
||||||
|
static const GLfloat texverts[4][2] = {
|
||||||
|
{0, v_max},
|
||||||
|
{0, 0},
|
||||||
|
{u_max, 0},
|
||||||
|
{u_max, v_max}
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
static const GLfloat texverts[4][2] = {
|
||||||
|
{0, 1},
|
||||||
|
{0, 0},
|
||||||
|
{1, 0},
|
||||||
|
{1, 1}
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts);
|
||||||
|
glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts);
|
||||||
|
glEnableVertexAttribArray(attr_pos);
|
||||||
|
glEnableVertexAttribArray(attr_tex);
|
||||||
|
glActiveTexture(GL_TEXTURE0);
|
||||||
|
glUniform1i(uni_tex, 0);
|
||||||
|
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
||||||
|
glDisableVertexAttribArray(attr_pos);
|
||||||
|
glDisableVertexAttribArray(attr_tex);
|
||||||
|
|
||||||
|
glBindTexture(TEX2D, 0);
|
||||||
GL_REPORT_ERRORD();
|
GL_REPORT_ERRORD();
|
||||||
|
|
||||||
GLfloat u_max = (GLfloat)width;
|
|
||||||
GLfloat v_max = (GLfloat)glHeight;
|
|
||||||
|
|
||||||
glBegin(GL_QUADS);
|
|
||||||
glTexCoord2f(0, v_max); glVertex2f(-1, -1);
|
|
||||||
glTexCoord2f(0, 0); glVertex2f(-1, 1);
|
|
||||||
glTexCoord2f(u_max, 0); glVertex2f( 1, 1);
|
|
||||||
glTexCoord2f(u_max, v_max); glVertex2f( 1, -1);
|
|
||||||
glEnd();
|
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SWRenderer::SwapBuffer()
|
void SWRenderer::SwapBuffer()
|
||||||
{
|
{
|
||||||
DrawDebugText();
|
DrawDebugText();
|
||||||
|
|
||||||
glFlush();
|
glFlush();
|
||||||
|
|
||||||
OpenGL_SwapBuffers();
|
GLInterface->Swap();
|
||||||
|
|
||||||
GL_REPORT_ERRORD();
|
swstats.ResetFrame();
|
||||||
|
|
||||||
swstats.ResetFrame();
|
|
||||||
|
|
||||||
// Clear framebuffer
|
#ifndef USE_GLES
|
||||||
glClearColor(0, 0, 0, 0);
|
glClearDepth(1.0f);
|
||||||
glClearDepth(1.0);
|
#endif
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||||
|
|
||||||
GL_REPORT_ERRORD();
|
GL_REPORT_ERRORD();
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ void SWVideoConfig::Load(const char* ini_file)
|
||||||
iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware
|
iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware
|
||||||
iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
|
iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
|
||||||
|
|
||||||
iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false);
|
iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, true);
|
||||||
|
|
||||||
iniFile.Get("Info", "ShowStats", &bShowStats, false);
|
iniFile.Get("Info", "ShowStats", &bShowStats, false);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,8 @@
|
||||||
#include "VideoBackend.h"
|
#include "VideoBackend.h"
|
||||||
#include "Core.h"
|
#include "Core.h"
|
||||||
|
|
||||||
|
#define VSYNC_ENABLED 0
|
||||||
|
|
||||||
namespace SW
|
namespace SW
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -69,8 +71,9 @@ void VideoSoftware::ShowConfig(void *_hParent)
|
||||||
bool VideoSoftware::Initialize(void *&window_handle)
|
bool VideoSoftware::Initialize(void *&window_handle)
|
||||||
{
|
{
|
||||||
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
|
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
|
||||||
|
InitInterface();
|
||||||
|
|
||||||
if (!OpenGL_Create(window_handle))
|
if (!GLInterface->Create(window_handle))
|
||||||
{
|
{
|
||||||
INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
|
INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -83,8 +86,10 @@ bool VideoSoftware::Initialize(void *&window_handle)
|
||||||
OpcodeDecoder::Init();
|
OpcodeDecoder::Init();
|
||||||
Clipper::Init();
|
Clipper::Init();
|
||||||
Rasterizer::Init();
|
Rasterizer::Init();
|
||||||
HwRasterizer::Init();
|
if (g_SWVideoConfig.bHwRasterizer)
|
||||||
SWRenderer::Init();
|
HwRasterizer::Init();
|
||||||
|
else
|
||||||
|
SWRenderer::Init();
|
||||||
DebugUtil::Init();
|
DebugUtil::Init();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -129,14 +134,44 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState)
|
||||||
|
|
||||||
void VideoSoftware::Shutdown()
|
void VideoSoftware::Shutdown()
|
||||||
{
|
{
|
||||||
SWRenderer::Shutdown();
|
if (g_SWVideoConfig.bHwRasterizer)
|
||||||
OpenGL_Shutdown();
|
HwRasterizer::Shutdown();
|
||||||
|
else
|
||||||
|
SWRenderer::Shutdown();
|
||||||
|
GLInterface->Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is called after Video_Initialize() from the Core
|
// This is called after Video_Initialize() from the Core
|
||||||
void VideoSoftware::Video_Prepare()
|
void VideoSoftware::Video_Prepare()
|
||||||
{
|
{
|
||||||
SWRenderer::Prepare();
|
GLInterface->MakeCurrent();
|
||||||
|
// Init extension support.
|
||||||
|
{
|
||||||
|
#ifndef USE_GLES
|
||||||
|
if (glewInit() != GLEW_OK) {
|
||||||
|
ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle VSync on/off
|
||||||
|
#ifdef _WIN32
|
||||||
|
if (WGLEW_EXT_swap_control)
|
||||||
|
wglSwapIntervalEXT(VSYNC_ENABLED);
|
||||||
|
else
|
||||||
|
ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?");
|
||||||
|
#elif defined(HAVE_X11) && HAVE_X11
|
||||||
|
if (glXSwapIntervalSGI)
|
||||||
|
glXSwapIntervalSGI(VSYNC_ENABLED);
|
||||||
|
else
|
||||||
|
ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)");
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
if (g_SWVideoConfig.bHwRasterizer)
|
||||||
|
HwRasterizer::Prepare();
|
||||||
|
else
|
||||||
|
SWRenderer::Prepare();
|
||||||
|
|
||||||
INFO_LOG(VIDEO, "Video backend initialized.");
|
INFO_LOG(VIDEO, "Video backend initialized.");
|
||||||
}
|
}
|
||||||
|
|
@ -278,20 +313,7 @@ writeFn32 VideoSoftware::Video_PEWrite32()
|
||||||
// Draw messages on top of the screen
|
// Draw messages on top of the screen
|
||||||
unsigned int VideoSoftware::PeekMessages()
|
unsigned int VideoSoftware::PeekMessages()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
return GLInterface->PeekMessages();
|
||||||
// TODO: peekmessage
|
|
||||||
MSG msg;
|
|
||||||
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
|
|
||||||
{
|
|
||||||
if (msg.message == WM_QUIT)
|
|
||||||
return FALSE;
|
|
||||||
TranslateMessage(&msg);
|
|
||||||
DispatchMessage(&msg);
|
|
||||||
}
|
|
||||||
return TRUE;
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show the current FPS
|
// Show the current FPS
|
||||||
|
|
@ -299,7 +321,7 @@ void VideoSoftware::UpdateFPSDisplay(const char *text)
|
||||||
{
|
{
|
||||||
char temp[100];
|
char temp[100];
|
||||||
snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text);
|
snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text);
|
||||||
OpenGL_SetWindowText(temp);
|
GLInterface->UpdateFPSDisplay(temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue