diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-06 22:55:05 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-06 22:55:05 +0200 |
| commit | e4d1ad4bdacd1b1c57e9b88b1868a770867a5744 (patch) | |
| tree | 11c3c1563e1d39805894e7d37f792f90347fb100 /src | |
| parent | added project linker reference (diff) | |
| download | yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.gz yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.bz2 yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.lz yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.xz yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.zst yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/src/emu_window/emu_window_glfw.cpp | 4 | ||||
| -rw-r--r-- | src/citra/src/emu_window/emu_window_glfw.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/citra/src/emu_window/emu_window_glfw.cpp b/src/citra/src/emu_window/emu_window_glfw.cpp index 8edc745b7..4cdb7fbb0 100644 --- a/src/citra/src/emu_window/emu_window_glfw.cpp +++ b/src/citra/src/emu_window/emu_window_glfw.cpp @@ -23,6 +23,7 @@ */ #include "common.h" +#include "video_core.h" #include "emu_window_glfw.h" static void OnKeyEvent(GLFWwindow* win, int key, int action) { @@ -54,7 +55,8 @@ EmuWindow_GLFW::EmuWindow_GLFW() { } glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); - render_window_ = glfwCreateWindow(640, 480, "citra", NULL, NULL); + render_window_ = glfwCreateWindow(VideoCore::kScreenTopWidth, + (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), "citra", NULL, NULL); // Setup callbacks glfwSetWindowUserPointer(render_window_, this); diff --git a/src/citra/src/emu_window/emu_window_glfw.h b/src/citra/src/emu_window/emu_window_glfw.h index 0339b5d68..abca9faa8 100644 --- a/src/citra/src/emu_window/emu_window_glfw.h +++ b/src/citra/src/emu_window/emu_window_glfw.h @@ -22,8 +22,7 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#ifndef CITRA_EMUWINDOW_GLFW_ -#define CITRA_EMUWINDOW_GLFW_ +#pragma once #include <GL/glew.h> #include <GLFW/glfw3.h> @@ -52,5 +51,3 @@ public: private: }; - -#endif // CITRA_EMUWINDOW_GLFW_ |