Merge pull request #97 from archshift/cleanup
Small, general code cleanup
This commit is contained in:
commit
5481115e71
|
@ -19,9 +19,8 @@
|
|||
#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
|
||||
|
||||
EmuThread::EmuThread(GRenderWindow* render_window) :
|
||||
exec_cpu_step(false), cpu_running(false),
|
||||
render_window(render_window), filename(""),
|
||||
stop_run(false)
|
||||
filename(""), exec_cpu_step(false), cpu_running(false),
|
||||
stop_run(false), render_window(render_window)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ void LoadSymbolMap(std::string filename) {
|
|||
std::ifstream infile(filename);
|
||||
|
||||
std::string address_str, function_name, line;
|
||||
u32 size, address;
|
||||
u32 size;
|
||||
|
||||
while (std::getline(infile, line)) {
|
||||
std::istringstream iss(line);
|
||||
|
|
|
@ -18,28 +18,28 @@ static const GLfloat kViewportAspectRatio =
|
|||
|
||||
// Fullscreen quad dimensions
|
||||
static const GLfloat kTopScreenWidthNormalized = 2;
|
||||
static const GLfloat kTopScreenHeightNormalized = kTopScreenWidthNormalized * (static_cast<float>(VideoCore::kScreenTopHeight) / VideoCore::kScreenTopWidth);
|
||||
static const GLfloat kBottomScreenWidthNormalized = kTopScreenWidthNormalized * (static_cast<float>(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth);
|
||||
static const GLfloat kTopScreenHeightNormalized = kTopScreenWidthNormalized * (static_cast<float>(VideoCore::kScreenTopHeight) / VideoCore::kScreenTopWidth);
|
||||
static const GLfloat kBottomScreenWidthNormalized = kTopScreenWidthNormalized * (static_cast<float>(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth);
|
||||
static const GLfloat kBottomScreenHeightNormalized = kBottomScreenWidthNormalized * (static_cast<float>(VideoCore::kScreenBottomHeight) / VideoCore::kScreenBottomWidth);
|
||||
|
||||
static const GLfloat g_vbuffer_top[] = {
|
||||
// x, y, z u, v
|
||||
-1.0f, 0.0f, 0.0f, 0.0f, 1.0f,
|
||||
1.0f, 0.0f, 0.0f, 1.0f, 1.0f,
|
||||
1.0f, kTopScreenHeightNormalized, 0.0f, 1.0f, 0.0f,
|
||||
1.0f, kTopScreenHeightNormalized, 0.0f, 1.0f, 0.0f,
|
||||
-1.0f, kTopScreenHeightNormalized, 0.0f, 0.0f, 0.0f,
|
||||
-1.0f, 0.0f, 0.0f, 0.0f, 1.0f
|
||||
// x, y z u v
|
||||
-1.0f, 0.0f, 0.0f, 0.0f, 1.0f,
|
||||
1.0f, 0.0f, 0.0f, 1.0f, 1.0f,
|
||||
1.0f, kTopScreenHeightNormalized, 0.0f, 1.0f, 0.0f,
|
||||
1.0f, kTopScreenHeightNormalized, 0.0f, 1.0f, 0.0f,
|
||||
-1.0f, kTopScreenHeightNormalized, 0.0f, 0.0f, 0.0f,
|
||||
-1.0f, 0.0f, 0.0f, 0.0f, 1.0f
|
||||
};
|
||||
|
||||
static const GLfloat g_vbuffer_bottom[] = {
|
||||
// x, y, z u, v
|
||||
-(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 0.0f, 1.0f,
|
||||
(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 1.0f, 1.0f,
|
||||
(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 1.0f, 0.0f,
|
||||
(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 1.0f, 0.0f,
|
||||
-(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 0.0f, 0.0f,
|
||||
-(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 0.0f, 1.0f
|
||||
// x y z u v
|
||||
-(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 0.0f, 1.0f,
|
||||
(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 1.0f, 1.0f,
|
||||
(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 1.0f, 0.0f,
|
||||
(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 1.0f, 0.0f,
|
||||
-(kBottomScreenWidthNormalized / 2), 0.0f, 0.0f, 0.0f, 0.0f,
|
||||
-(kBottomScreenWidthNormalized / 2), -kBottomScreenHeightNormalized, 0.0f, 0.0f, 1.0f
|
||||
};
|
||||
|
||||
/// RendererOpenGL constructor
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "video_core/utils.h"
|
||||
|
||||
namespace VideoCore {
|
||||
|
||||
/**
|
||||
* Dumps a texture to TGA
|
||||
* @param filename String filename to dump texture to
|
||||
|
@ -16,29 +17,20 @@ namespace VideoCore {
|
|||
* @param raw_data Raw RGBA8 texture data to dump
|
||||
* @todo This should be moved to some general purpose/common code
|
||||
*/
|
||||
void DumpTGA(std::string filename, int width, int height, u8* raw_data) {
|
||||
TGAHeader hdr;
|
||||
FILE* fout;
|
||||
u8 r, g, b;
|
||||
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
hdr.datatypecode = 2; // uncompressed RGB
|
||||
hdr.bitsperpixel = 24; // 24 bpp
|
||||
hdr.width = width;
|
||||
hdr.height = height;
|
||||
|
||||
fout = fopen(filename.c_str(), "wb");
|
||||
void DumpTGA(std::string filename, short width, short height, u8* raw_data) {
|
||||
TGAHeader hdr = {0, 0, 2, 0, 0, 0, 0, width, height, 24, 0};
|
||||
FILE* fout = fopen(filename.c_str(), "wb");
|
||||
|
||||
fwrite(&hdr, sizeof(TGAHeader), 1, fout);
|
||||
for (int i = 0; i < height; i++) {
|
||||
for (int j = 0; j < width; j++) {
|
||||
b = raw_data[(3 * (i * width)) + (3 * j) + 0];
|
||||
g = raw_data[(3 * (i * width)) + (3 * j) + 1];
|
||||
r = raw_data[(3 * (i * width)) + (3 * j) + 2];
|
||||
putc(b, fout);
|
||||
putc(g, fout);
|
||||
putc(r, fout);
|
||||
|
||||
for (int y = 0; y < height; y++) {
|
||||
for (int x = 0; x < width; x++) {
|
||||
putc(raw_data[(3 * (y * width)) + (3 * x) + 0], fout); // b
|
||||
putc(raw_data[(3 * (y * width)) + (3 * x) + 1], fout); // g
|
||||
putc(raw_data[(3 * (y * width)) + (3 * x) + 2], fout); // r
|
||||
}
|
||||
}
|
||||
|
||||
fclose(fout);
|
||||
}
|
||||
} // namespace
|
||||
|
|
|
@ -59,6 +59,6 @@ struct TGAHeader {
|
|||
* @param raw_data Raw RGBA8 texture data to dump
|
||||
* @todo This should be moved to some general purpose/common code
|
||||
*/
|
||||
void DumpTGA(std::string filename, int width, int height, u8* raw_data);
|
||||
void DumpTGA(std::string filename, short width, short height, u8* raw_data);
|
||||
|
||||
} // namespace
|
||||
|
|
|
@ -21,13 +21,6 @@ EmuWindow* g_emu_window = NULL; ///< Frontend emulator window
|
|||
RendererBase* g_renderer = NULL; ///< Renderer plugin
|
||||
int g_current_frame = 0;
|
||||
|
||||
/// Start the video core
|
||||
void Start() {
|
||||
if (g_emu_window == NULL) {
|
||||
ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
|
||||
}
|
||||
}
|
||||
|
||||
/// Initialize the video core
|
||||
void Init(EmuWindow* emu_window) {
|
||||
g_emu_window = emu_window;
|
||||
|
|
Reference in New Issue