citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

fixed license header in video_core

This commit is contained in:
bunnei 2014-04-08 19:04:25 -04:00
parent 8dedab0bac
commit ef7cfa0207
7 changed files with 23 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_core/src/renderer_base.h
View File

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2014 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file renderer_base.h
* @author bunnei
* @date 2014-04-05
* @brief Renderer base class for new video core
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#pragma once #pragma once

26
src/video_core/src/renderer_opengl/renderer_opengl.cpp
View File

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2014 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file renderer_opengl.cpp
* @author bunnei
* @date 2014-04-05
* @brief Renderer for OpenGL 3.x
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#include "mem_map.h" #include "mem_map.h"
#include "video_core.h" #include "video_core.h"

27
src/video_core/src/renderer_opengl/renderer_opengl.h
View File

@ -1,32 +1,11 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2014 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file renderer_opengl.h
* @author bunnei
* @date 2014-04-05
* @brief Renderer for OpenGL 3.x
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#pragma once #pragma once
#include <GL/glew.h> #include <GL/glew.h>
#include "common.h" #include "common.h"
#include "emu_window.h" #include "emu_window.h"

26
src/video_core/src/utils.cpp
View File

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2005-2012 Gekko Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file utils.cpp
* @author ShizZy <shizzy247@gmail.com>
* @date 2012-12-28
* @brief Utility functions (in general, not related to emulation) useful for video core
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

29
src/video_core/src/utils.h
View File

@ -1,32 +1,13 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2005-2012 Gekko Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file utils.h
* @author ShizZy <shizzy247@gmail.com>
* @date 2012-12-28
* @brief Utility functions (in general, not related to emulation) useful for video core
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#pragma once #pragma once
#include "common_types.h"
#include <string> #include <string>
#include "common_types.h"
namespace FormatPrecision { namespace FormatPrecision {
/// Adjust RGBA8 color with RGBA6 precision /// Adjust RGBA8 color with RGBA6 precision

45
src/video_core/src/video_core.cpp
View File

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2014 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file video_core.cpp
* @author bunnei
* @date 2014-04-05
* @brief Main module for new video core
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#include "common.h" #include "common.h"
#include "emu_window.h" #include "emu_window.h"
@ -41,30 +21,11 @@ EmuWindow* g_emu_window = NULL; ///< Frontend emulator window
RendererBase* g_renderer = NULL; ///< Renderer plugin RendererBase* g_renderer = NULL; ///< Renderer plugin
int g_current_frame = 0; int g_current_frame = 0;
int VideoEntry(void*) {
if (g_emu_window == NULL) {
ERROR_LOG(VIDEO, "VideoCore::VideoEntry called without calling Init()!");
}
g_emu_window->MakeCurrent();
//for(;;) {
// gp::Fifo_DecodeCommand();
//}
return 0;
}
/// Start the video core /// Start the video core
void Start() { void Start() {
if (g_emu_window == NULL) { if (g_emu_window == NULL) {
ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!"); ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
} }
//if (common::g_config->enable_multicore()) {
// g_emu_window->DoneCurrent();
// g_video_thread = SDL_CreateThread(VideoEntry, NULL, NULL);
// if (g_video_thread == NULL) {
// LOG_ERROR(TVIDEO, "Unable to create thread: %s... Exiting\n", SDL_GetError());
// exit(1);
// }
//}
} }
/// Initialize the video core /// Initialize the video core

26
src/video_core/src/video_core.h
View File

@ -1,26 +1,6 @@
/*! // Copyright 2014 Citra Emulator Project
* Copyright (C) 2014 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file video_core.h
* @author bunnei
* @date 2014-04-05
* @brief Main module for new video core
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#pragma once #pragma once