piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed windows and linux builds. the console/debugger/etc files in lle/hle/ogl really need to be de-uglified!

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@833 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-10-11 02:29:57 +00:00
parent 540539ee27
commit 3d1cc88b4f
4 changed files with 209 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp
View File

@ -18,12 +18,12 @@
// --------------------
// Includes
#include "../Globals.h"
#include <string>
#include <stdio.h>
#ifdef _WIN32
#include <windows.h>
#endif
#include "../Globals.h"
// --------------------
@ -149,12 +149,15 @@ void ClearScreen()
#endif
}
#ifndef _WIN32
// VERY UGLY! needs to be fixed soon, just fixing the biuld...
void CloseConsole()
{
}
void OpenConsole()
{
}
#endif
#if defined(DEBUGG) && defined(_WIN32)
HWND GetConsoleHwnd(void)

3
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -15,6 +15,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "Globals.h"
#ifdef _WIN32
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
@ -27,7 +29,6 @@
#undef _interlockedbittestandreset64
#endif
#include "Globals.h"
#include "Profiler.h"
#include "Render.h"

12
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
View File

@ -362,8 +362,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs)
wAdj = ratio;
hAdj = 1;
wid = ceil(abs(2 * rawViewport[0]) / wAdj);
hei = ceil(abs(2 * rawViewport[1]) / hAdj);
wid = ceil(fabs(2 * rawViewport[0]) / wAdj);
hei = ceil(fabs(2 * rawViewport[1]) / hAdj);
actualWid = ceil((float)winw / ratio);
actualRatiow = (float)actualWid / (float)wid; // the picture versus the screen
@ -377,8 +377,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs)
wAdj = 1;
hAdj = ratio;
wid = ceil(abs(2 * rawViewport[0]) / wAdj);
hei = ceil(abs(2 * rawViewport[1]) / hAdj);
wid = ceil(fabs(2 * rawViewport[0]) / wAdj);
hei = ceil(fabs(2 * rawViewport[1]) / hAdj);
actualHei = ceil((float)winh / ratio);
actualRatioh = (float)actualHei / (float)hei; // the picture versus the screen
@ -388,8 +388,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs)
}
else
{
wid = ceil(abs(2 * rawViewport[0]));
hei = ceil(abs(2 * rawViewport[1]));
wid = ceil(fabs(2 * rawViewport[0]));
hei = ceil(fabs(2 * rawViewport[1]));
}
if(g_Config.bStretchToFit)