summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-06 16:55:05 -0400
committerGravatar bunnei2014-04-06 16:55:05 -0400
commite4d1ad4bdacd1b1c57e9b88b1868a770867a5744 (patch)
tree11c3c1563e1d39805894e7d37f792f90347fb100
parentadded project linker reference (diff)
downloadyuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.gz
yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.tar.xz
yuzu-e4d1ad4bdacd1b1c57e9b88b1868a770867a5744.zip
set window size to correspond to framebuffer sizes
-rw-r--r--src/citra/src/emu_window/emu_window_glfw.cpp4
-rw-r--r--src/citra/src/emu_window/emu_window_glfw.h5
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 @@
23 */ 23 */
24 24
25#include "common.h" 25#include "common.h"
26#include "video_core.h"
26#include "emu_window_glfw.h" 27#include "emu_window_glfw.h"
27 28
28static void OnKeyEvent(GLFWwindow* win, int key, int action) { 29static void OnKeyEvent(GLFWwindow* win, int key, int action) {
@@ -54,7 +55,8 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
54 } 55 }
55 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); 56 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
56 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); 57 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
57 render_window_ = glfwCreateWindow(640, 480, "citra", NULL, NULL); 58 render_window_ = glfwCreateWindow(VideoCore::kScreenTopWidth,
59 (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), "citra", NULL, NULL);
58 60
59 // Setup callbacks 61 // Setup callbacks
60 glfwSetWindowUserPointer(render_window_, this); 62 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 @@
22 * http://code.google.com/p/gekko-gc-emu/ 22 * http://code.google.com/p/gekko-gc-emu/
23 */ 23 */
24 24
25#ifndef CITRA_EMUWINDOW_GLFW_ 25#pragma once
26#define CITRA_EMUWINDOW_GLFW_
27 26
28#include <GL/glew.h> 27#include <GL/glew.h>
29#include <GLFW/glfw3.h> 28#include <GLFW/glfw3.h>
@@ -52,5 +51,3 @@ public:
52private: 51private:
53 52
54}; 53};
55
56#endif // CITRA_EMUWINDOW_GLFW_