fixed win + removed unused files

diff --git a/source/citraimport/GPU/video_core/rasterizer.cpp b/source/citraimport/GPU/video_core/rasterizer.cpp
index c3eaefae29159f19addd487ffc83c898a21e4e65..c074aad9c52ed336ff6f5747a48a8596407da5df 100644 (file)
--- a/source/citraimport/GPU/video_core/rasterizer.cpp
+++ b/source/citraimport/GPU/video_core/rasterizer.cpp
@@ -439,7 +439,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
                 if (!texture.enabled)
                     continue;
 
-                ASSERT(0 != texture.config.address);
+                               assert(0 != texture.config.address);
 
                 int s = (int)(uv[i].u() * float24::FromFloat32(static_cast<float>(texture.config.width))).ToFloat32();
                 int t = (int)(uv[i].v() * float24::FromFloat32(static_cast<float>(texture.config.height))).ToFloat32();

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
index d49f437aa3e95604e63efe7eb00c77743614a96d..88cfbba1cfba30309f0ed0b97117ea6a5e3f6846 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -146,8 +146,8 @@ void RasterizerOpenGL::InitObjects() {
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb_color_texture.texture.handle, 0);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, fb_depth_texture.texture.handle, 0);
 
-    ASSERT_MSG(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE,
-               "OpenGL rasterizer framebuffer setup failed, status %X", glCheckFramebufferStatus(GL_FRAMEBUFFER));
+    /*ASSERT_MSG(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE,
+               "OpenGL rasterizer framebuffer setup failed, status %X", glCheckFramebufferStatus(GL_FRAMEBUFFER));*/
 }
 
 void RasterizerOpenGL::Reset() {

diff --git a/source/citraimport/key_map.cpp b/source/citraimport/key_map.cpp
deleted file mode 100644 (file)
index ac324e3..0000000
--- a/source/citraimport/key_map.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-/* hid todo
-#include "key_map.h"
-#include <map>
-
-namespace KeyMap {
-
-static std::map<HostDeviceKey, Service::HID::PadState> key_map;
-static int next_device_id = 0;
-
-int NewDeviceId() {
-    return next_device_id++;
-}
-
-void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState) {
-    key_map[key].hex = padState.hex;
-}
-
-Service::HID::PadState GetPadKey(HostDeviceKey key) {
-    return key_map[key];
-}
-
-}
-*/
\ No newline at end of file

diff --git a/source/citraimport/key_map.h b/source/citraimport/key_map.h
deleted file mode 100644 (file)
index 0ecec71..0000000
--- a/source/citraimport/key_map.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/hid/hid.h"
-
-namespace KeyMap {
-
-/**
- * Represents a key for a specific host device.
- */
-struct HostDeviceKey {
-    int key_code;
-    int device_id; ///< Uniquely identifies a host device
-
-    bool operator < (const HostDeviceKey &other) const {
-        if (device_id == other.device_id) {
-            return key_code < other.key_code;
-        }
-        return device_id < other.device_id;
-    }
-
-    bool operator == (const HostDeviceKey &other) const {
-        return device_id == other.device_id && key_code == other.key_code;
-    }
-};
-
-/**
- * Generates a new device id, which uniquely identifies a host device within KeyMap.
- */
-int NewDeviceId();
-
-/**
- * Maps a device-specific key to a PadState.
- */
-void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState);
-
-/**
- * Gets the PadState that's mapped to the provided device-specific key.
- */
-Service::HID::PadState GetPadKey(HostDeviceKey key);
-
-}