From 0167e9140e2a732c2267bdc4672ecd0360d49227 Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 6 Sep 2014 20:04:13 -0700 Subject: utils: cleaned up DumpTGA, removing redundancies --- src/video_core/utils.cpp | 32 ++++++++++++-------------------- src/video_core/utils.h | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index b94376ac..c1848f92 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp @@ -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 diff --git a/src/video_core/utils.h b/src/video_core/utils.h index 20d4ec9e..9cb3d4d4 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -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 -- cgit v1.2.3 From 9c0efdb75b293d4818ea82b33422e868ee0e5fb9 Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 6 Sep 2014 20:04:39 -0700 Subject: bootmanager::EmuThread: fixed initialization order --- src/citra_qt/bootmanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 573060d3..9ccb935a 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -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) { } -- cgit v1.2.3 From 1c02c03e3204c3f2ec4e7018ed199cc28e667d04 Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 6 Sep 2014 20:05:22 -0700 Subject: Dead code removal: video_core.cpp, load_symbol_map.cpp --- src/core/arm/disassembler/load_symbol_map.cpp | 2 +- src/video_core/video_core.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp index d7fc0a04..b4a5429a 100644 --- a/src/core/arm/disassembler/load_symbol_map.cpp +++ b/src/core/arm/disassembler/load_symbol_map.cpp @@ -19,7 +19,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); diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 9aaff491..c779771c 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -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; -- cgit v1.2.3 From 81baa477b503796f3dbf9308a7fdf51a871f5c37 Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 6 Sep 2014 20:05:53 -0700 Subject: renderer_opengl.cpp: improved alignment for readability --- src/video_core/renderer_opengl/renderer_opengl.cpp | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 0e4e0651..4ab1ccb2 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -18,28 +18,28 @@ static const GLfloat kViewportAspectRatio = // Fullscreen quad dimensions static const GLfloat kTopScreenWidthNormalized = 2; -static const GLfloat kTopScreenHeightNormalized = kTopScreenWidthNormalized * (static_cast(VideoCore::kScreenTopHeight) / VideoCore::kScreenTopWidth); -static const GLfloat kBottomScreenWidthNormalized = kTopScreenWidthNormalized * (static_cast(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth); +static const GLfloat kTopScreenHeightNormalized = kTopScreenWidthNormalized * (static_cast(VideoCore::kScreenTopHeight) / VideoCore::kScreenTopWidth); +static const GLfloat kBottomScreenWidthNormalized = kTopScreenWidthNormalized * (static_cast(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth); static const GLfloat kBottomScreenHeightNormalized = kBottomScreenWidthNormalized * (static_cast(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 -- cgit v1.2.3