eitan.c/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

set window size to correspond to framebuffer sizes

Browse source
This commit is contained in:
bunnei 2014-04-06 16:55:05 -04:00
parent a604eaee54
commit e4d1ad4bda
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/citra/src/emu_window/emu_window_glfw.cpp
View file

@ -23,6 +23,7 @@
*/ */
#include "common.h" #include "common.h"
#include "video_core.h"
#include "emu_window_glfw.h" #include "emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) { 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_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); 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 // Setup callbacks
glfwSetWindowUserPointer(render_window_, this); glfwSetWindowUserPointer(render_window_, this);

5
src/citra/src/emu_window/emu_window_glfw.h
View file

@ -22,8 +22,7 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#ifndef CITRA_EMUWINDOW_GLFW_ #pragma once
#define CITRA_EMUWINDOW_GLFW_
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
@ -52,5 +51,3 @@ public:
private: private:
}; };
#endif // CITRA_EMUWINDOW_GLFW_