summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_core/src/renderer_base.h26
-rw-r--r--src/video_core/src/renderer_opengl/renderer_opengl.cpp26
-rw-r--r--src/video_core/src/renderer_opengl/renderer_opengl.h27
-rw-r--r--src/video_core/src/utils.cpp26
-rw-r--r--src/video_core/src/utils.h29
-rw-r--r--src/video_core/src/video_core.cpp45
-rw-r--r--src/video_core/src/video_core.h26
7 files changed, 23 insertions, 182 deletions
diff --git a/src/video_core/src/renderer_base.h b/src/video_core/src/renderer_base.h
index 61c568694..94748d690 100644
--- a/src/video_core/src/renderer_base.h
+++ b/src/video_core/src/renderer_base.h
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file renderer_base.h
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Renderer base class for new video core
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#pragma once 5#pragma once
26 6
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.cpp b/src/video_core/src/renderer_opengl/renderer_opengl.cpp
index 8a4d1ab72..6010bcbc3 100644
--- a/src/video_core/src/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/src/renderer_opengl/renderer_opengl.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file renderer_opengl.cpp
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Renderer for OpenGL 3.x
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "mem_map.h" 5#include "mem_map.h"
26#include "video_core.h" 6#include "video_core.h"
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/src/renderer_opengl/renderer_opengl.h
index b91fcacaa..86dc7b70e 100644
--- a/src/video_core/src/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/src/renderer_opengl/renderer_opengl.h
@@ -1,32 +1,11 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file renderer_opengl.h
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Renderer for OpenGL 3.x
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#pragma once 5#pragma once
26 6
27#include <GL/glew.h> 7#include <GL/glew.h>
28 8
29
30#include "common.h" 9#include "common.h"
31#include "emu_window.h" 10#include "emu_window.h"
32 11
diff --git a/src/video_core/src/utils.cpp b/src/video_core/src/utils.cpp
index a5e702f67..a6dd1e02c 100644
--- a/src/video_core/src/utils.cpp
+++ b/src/video_core/src/utils.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2005-2012 Gekko Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file utils.cpp
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2012-12-28
7 * @brief Utility functions (in general, not related to emulation) useful for video core
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include <stdio.h> 5#include <stdio.h>
26#include <string.h> 6#include <string.h>
diff --git a/src/video_core/src/utils.h b/src/video_core/src/utils.h
index 2d7fa4a3a..c417342e1 100644
--- a/src/video_core/src/utils.h
+++ b/src/video_core/src/utils.h
@@ -1,32 +1,13 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2005-2012 Gekko Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file utils.h
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2012-12-28
7 * @brief Utility functions (in general, not related to emulation) useful for video core
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#pragma once 5#pragma once
26 6
27#include "common_types.h"
28#include <string> 7#include <string>
29 8
9#include "common_types.h"
10
30namespace FormatPrecision { 11namespace FormatPrecision {
31 12
32/// Adjust RGBA8 color with RGBA6 precision 13/// Adjust RGBA8 color with RGBA6 precision
diff --git a/src/video_core/src/video_core.cpp b/src/video_core/src/video_core.cpp
index 52ff90488..6c0c415f5 100644
--- a/src/video_core/src/video_core.cpp
+++ b/src/video_core/src/video_core.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file video_core.cpp
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Main module for new video core
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "common.h" 5#include "common.h"
26#include "emu_window.h" 6#include "emu_window.h"
@@ -41,30 +21,11 @@ EmuWindow* g_emu_window = NULL; ///< Frontend emulator window
41RendererBase* g_renderer = NULL; ///< Renderer plugin 21RendererBase* g_renderer = NULL; ///< Renderer plugin
42int g_current_frame = 0; 22int g_current_frame = 0;
43 23
44int VideoEntry(void*) {
45 if (g_emu_window == NULL) {
46 ERROR_LOG(VIDEO, "VideoCore::VideoEntry called without calling Init()!");
47 }
48 g_emu_window->MakeCurrent();
49 //for(;;) {
50 // gp::Fifo_DecodeCommand();
51 //}
52 return 0;
53}
54
55/// Start the video core 24/// Start the video core
56void Start() { 25void Start() {
57 if (g_emu_window == NULL) { 26 if (g_emu_window == NULL) {
58 ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!"); 27 ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
59 } 28 }
60 //if (common::g_config->enable_multicore()) {
61 // g_emu_window->DoneCurrent();
62 // g_video_thread = SDL_CreateThread(VideoEntry, NULL, NULL);
63 // if (g_video_thread == NULL) {
64 // LOG_ERROR(TVIDEO, "Unable to create thread: %s... Exiting\n", SDL_GetError());
65 // exit(1);
66 // }
67 //}
68} 29}
69 30
70/// Initialize the video core 31/// Initialize the video core
diff --git a/src/video_core/src/video_core.h b/src/video_core/src/video_core.h
index 10b8f1105..19bf49dd7 100644
--- a/src/video_core/src/video_core.h
+++ b/src/video_core/src/video_core.h
@@ -1,26 +1,6 @@
1/*! 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file video_core.h
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Main module for new video core
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#pragma once 5#pragma once
26 6
HIC SVNT DRACONES