mirror of
https://github.com/libretro/RetroArch
synced 2025-01-30 21:32:45 +00:00
(RSX/PSL1GHT) combine both video driver context files into one
This commit is contained in:
libretroadmin
parent
2dab525011
commit
9c2faafb6e
@ -20,7 +20,9 @@
|
||||
#include "../../config.h"
|
||||
#endif
|
||||
|
||||
#ifndef __PSL1GHT__
|
||||
#include <sys/spu_initialize.h>
|
||||
#endif
|
||||
|
||||
#include <compat/strl.h>
|
||||
|
||||
@ -28,6 +30,9 @@
|
||||
#include "../../retroarch.h"
|
||||
#include "../../verbosity.h"
|
||||
#include <defines/ps3_defines.h>
|
||||
#ifdef HAVE_GCM
|
||||
#include <rsx/rsx.h>
|
||||
#endif
|
||||
#include "../../frontend/frontend_driver.h"
|
||||
#if defined(HAVE_PSGL)
|
||||
#include "../common/gl_common.h"
|
||||
@ -45,7 +50,11 @@ typedef struct gfx_ctx_ps3_data
|
||||
} gfx_ctx_ps3_data_t;
|
||||
|
||||
/* TODO/FIXME - static global */
|
||||
#ifdef HAVE_GCM
|
||||
static enum gfx_ctx_api ps3_api = GFX_CTX_RSX_API;
|
||||
#else
|
||||
static enum gfx_ctx_api ps3_api = GFX_CTX_NONE;
|
||||
#endif
|
||||
|
||||
static void gfx_ctx_ps3_get_resolution(unsigned idx,
|
||||
unsigned *width, unsigned *height)
|
||||
@ -60,7 +69,7 @@ static void gfx_ctx_ps3_get_resolution(unsigned idx,
|
||||
static void gfx_ctx_ps3_get_available_resolutions(void)
|
||||
{
|
||||
unsigned i;
|
||||
uint32_t videomode[] = {
|
||||
uint32_t videomode[] = {
|
||||
CELL_VIDEO_OUT_RESOLUTION_480,
|
||||
CELL_VIDEO_OUT_RESOLUTION_576,
|
||||
CELL_VIDEO_OUT_RESOLUTION_960x1080,
|
||||
@ -126,26 +135,29 @@ static void gfx_ctx_ps3_get_available_resolutions(void)
|
||||
static void gfx_ctx_ps3_set_swap_interval(void *data, int interval)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
if (interval == 1)
|
||||
gl_enable(GL_VSYNC_SCE);
|
||||
else
|
||||
gl_disable(GL_VSYNC_SCE);
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
{
|
||||
if (interval == 1)
|
||||
gl_enable(GL_VSYNC_SCE);
|
||||
else
|
||||
gl_disable(GL_VSYNC_SCE);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void gfx_ctx_ps3_check_window(void *data, bool *quit,
|
||||
bool *resize, unsigned *width, unsigned *height)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
gl2_t *gl = data;
|
||||
#endif
|
||||
|
||||
*quit = false;
|
||||
*resize = false;
|
||||
|
||||
#if defined(HAVE_PSGL)
|
||||
if (gl->should_resize)
|
||||
*resize = true;
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
{
|
||||
gl2_t *gl = data;
|
||||
if (gl->should_resize)
|
||||
*resize = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -155,7 +167,8 @@ static bool gfx_ctx_ps3_suppress_screensaver(void *data, bool enable) { return f
|
||||
static void gfx_ctx_ps3_swap_buffers(void *data)
|
||||
{
|
||||
#ifdef HAVE_PSGL
|
||||
psglSwap();
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
psglSwap();
|
||||
#endif
|
||||
#ifdef HAVE_SYSUTILS
|
||||
cellSysutilCheckCallback();
|
||||
@ -166,9 +179,12 @@ static void gfx_ctx_ps3_get_video_size(void *data,
|
||||
unsigned *width, unsigned *height)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
gfx_ctx_ps3_data_t *ps3 = (gfx_ctx_ps3_data_t*)data;
|
||||
if (ps3)
|
||||
psglGetDeviceDimensions(ps3->gl_device, width, height);
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
{
|
||||
gfx_ctx_ps3_data_t *ps3 = (gfx_ctx_ps3_data_t*)data;
|
||||
if (ps3)
|
||||
psglGetDeviceDimensions(ps3->gl_device, width, height);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -252,10 +268,12 @@ static void gfx_ctx_ps3_destroy_resources(gfx_ctx_ps3_data_t *ps3)
|
||||
#if defined(HAVE_PSGL)
|
||||
if (!ps3)
|
||||
return;
|
||||
psglDestroyContext(ps3->gl_context);
|
||||
psglDestroyDevice(ps3->gl_device);
|
||||
|
||||
psglExit();
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
{
|
||||
psglDestroyContext(ps3->gl_context);
|
||||
psglDestroyDevice(ps3->gl_device);
|
||||
psglExit();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -287,10 +305,11 @@ static bool gfx_ctx_ps3_bind_api(void *data,
|
||||
{
|
||||
ps3_api = api;
|
||||
#ifdef HAVE_PSGL
|
||||
if (
|
||||
(api == GFX_CTX_OPENGL_API)
|
||||
|| (api == GFX_CTX_OPENGL_ES_API)
|
||||
)
|
||||
if (ps3_api == GFX_CTX_OPENGL_API || ps3_api == GFX_CTX_OPENGL_ES_API)
|
||||
return true;
|
||||
#endif
|
||||
#ifdef HAVE_GCM
|
||||
if (ps3_api == GFX_CTX_RSX_API)
|
||||
return true;
|
||||
#endif
|
||||
return false;
|
||||
|
||||
@ -1,325 +0,0 @@
|
||||
/* RetroArch - A frontend for libretro.
|
||||
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2017 - Daniel De Matteis
|
||||
*
|
||||
* RetroArch 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 Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* RetroArch 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with RetroArch.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "../../config.h"
|
||||
#endif
|
||||
|
||||
#include <compat/strl.h>
|
||||
|
||||
#include "../../configuration.h"
|
||||
#include "../../retroarch.h"
|
||||
#include "../../verbosity.h"
|
||||
#include <defines/ps3_defines.h>
|
||||
#include "../../frontend/frontend_driver.h"
|
||||
#include <rsx/rsx.h>
|
||||
|
||||
typedef struct gfx_ctx_psl1ght_data
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
PSGLdevice* gl_device;
|
||||
PSGLcontext* gl_context;
|
||||
#else
|
||||
void *empty;
|
||||
#endif
|
||||
} gfx_ctx_psl1ght_data_t;
|
||||
|
||||
/* TODO/FIXME - static global */
|
||||
static enum gfx_ctx_api ps3_api = GFX_CTX_RSX_API;
|
||||
|
||||
static void gfx_ctx_psl1ght_get_resolution(unsigned idx,
|
||||
unsigned *width, unsigned *height)
|
||||
{
|
||||
CellVideoOutResolution resolution;
|
||||
cellVideoOutGetResolution(idx, &resolution);
|
||||
|
||||
*width = resolution.width;
|
||||
*height = resolution.height;
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_get_available_resolutions(void)
|
||||
{
|
||||
unsigned i;
|
||||
uint32_t videomode[] = {
|
||||
CELL_VIDEO_OUT_RESOLUTION_480,
|
||||
CELL_VIDEO_OUT_RESOLUTION_576,
|
||||
CELL_VIDEO_OUT_RESOLUTION_960x1080,
|
||||
CELL_VIDEO_OUT_RESOLUTION_720,
|
||||
CELL_VIDEO_OUT_RESOLUTION_1280x1080,
|
||||
CELL_VIDEO_OUT_RESOLUTION_1440x1080,
|
||||
CELL_VIDEO_OUT_RESOLUTION_1600x1080,
|
||||
CELL_VIDEO_OUT_RESOLUTION_1080
|
||||
};
|
||||
uint32_t resolution_count = 0;
|
||||
bool defaultresolution = true;
|
||||
uint16_t num_videomodes = sizeof(videomode) / sizeof(uint32_t);
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
if (global->console.screen.resolutions.check)
|
||||
return;
|
||||
|
||||
for (i = 0; i < num_videomodes; i++)
|
||||
{
|
||||
if (cellVideoOutGetResolutionAvailability(
|
||||
CELL_VIDEO_OUT_PRIMARY, videomode[i],
|
||||
CELL_VIDEO_OUT_ASPECT_AUTO, 0))
|
||||
resolution_count++;
|
||||
}
|
||||
|
||||
global->console.screen.resolutions.count = 0;
|
||||
global->console.screen.resolutions.list =
|
||||
malloc(resolution_count * sizeof(uint32_t));
|
||||
|
||||
for (i = 0; i < num_videomodes; i++)
|
||||
{
|
||||
if (cellVideoOutGetResolutionAvailability(
|
||||
CELL_VIDEO_OUT_PRIMARY,
|
||||
videomode[i],
|
||||
CELL_VIDEO_OUT_ASPECT_AUTO, 0))
|
||||
{
|
||||
global->console.screen.resolutions.list[
|
||||
global->console.screen.resolutions.count++] = videomode[i];
|
||||
global->console.screen.resolutions.initial.id = videomode[i];
|
||||
|
||||
if (global->console.screen.resolutions.current.id == videomode[i])
|
||||
{
|
||||
defaultresolution = false;
|
||||
global->console.screen.resolutions.current.idx =
|
||||
global->console.screen.resolutions.count-1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* In case we didn't specify a resolution -
|
||||
* make the last resolution
|
||||
that was added to the list (the highest resolution)
|
||||
the default resolution */
|
||||
if (global->console.screen.resolutions.current.id > num_videomodes || defaultresolution)
|
||||
{
|
||||
global->console.screen.resolutions.current.idx = resolution_count - 1;
|
||||
global->console.screen.resolutions.current.id = global->console.screen.resolutions.list[global->console.screen.resolutions.current.idx];
|
||||
}
|
||||
|
||||
global->console.screen.resolutions.check = true;
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_set_swap_interval(void *data, int interval)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
if (interval == 1)
|
||||
glEnable(GL_VSYNC_SCE);
|
||||
else
|
||||
glDisable(GL_VSYNC_SCE);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_check_window(void *data, bool *quit,
|
||||
bool *resize, unsigned *width, unsigned *height)
|
||||
{
|
||||
}
|
||||
|
||||
static bool gfx_ctx_psl1ght_has_focus(void *data) { return true; }
|
||||
static bool gfx_ctx_psl1ght_suppress_screensaver(void *data, bool enable) { return false; }
|
||||
|
||||
static void gfx_ctx_psl1ght_swap_buffers(void *data)
|
||||
{
|
||||
#ifdef HAVE_PSGL
|
||||
psglSwap();
|
||||
#endif
|
||||
#ifdef HAVE_SYSUTILS
|
||||
cellSysutilCheckCallback();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_get_video_size(void *data,
|
||||
unsigned *width, unsigned *height)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
gfx_ctx_psl1ght_data_t *psl1ght = (gfx_ctx_psl1ght_data_t*)data;
|
||||
if (psl1ght)
|
||||
psglGetDeviceDimensions(ps3->gl_device, width, height);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void *gfx_ctx_psl1ght_init(void *video_driver)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
gfx_ctx_psl1ght_data_t *psl1ght = (gfx_ctx_psl1ght_data_t*)
|
||||
calloc(1, sizeof(gfx_ctx_psl1ght_data_t));
|
||||
|
||||
if (!psl1ght)
|
||||
return NULL;
|
||||
|
||||
global->console.screen.pal_enable =
|
||||
cellVideoOutGetResolutionAvailability(
|
||||
CELL_VIDEO_OUT_PRIMARY, CELL_VIDEO_OUT_RESOLUTION_576,
|
||||
CELL_VIDEO_OUT_ASPECT_AUTO, 0);
|
||||
|
||||
gfx_ctx_psl1ght_get_available_resolutions();
|
||||
|
||||
return psl1ght;
|
||||
}
|
||||
|
||||
static bool gfx_ctx_psl1ght_set_video_mode(void *data,
|
||||
unsigned width, unsigned height, bool fullscreen) { return true; }
|
||||
|
||||
static void gfx_ctx_psl1ght_destroy_resources(gfx_ctx_psl1ght_data_t *ps3)
|
||||
{
|
||||
#if defined(HAVE_PSGL)
|
||||
if (!ps3)
|
||||
return;
|
||||
psglDestroyContext(ps3->gl_context);
|
||||
psglDestroyDevice(ps3->gl_device);
|
||||
|
||||
psglExit();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_destroy(void *data)
|
||||
{
|
||||
gfx_ctx_psl1ght_data_t *ps3 = (gfx_ctx_psl1ght_data_t*)data;
|
||||
|
||||
if (!ps3)
|
||||
return;
|
||||
|
||||
gfx_ctx_psl1ght_destroy_resources(ps3);
|
||||
free(data);
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_input_driver(void *data,
|
||||
const char *joypad_name,
|
||||
input_driver_t **input, void **input_data)
|
||||
{
|
||||
void *ps3input = input_driver_init_wrap(&input_ps3, joypad_name);
|
||||
|
||||
*input = ps3input ? &input_ps3 : NULL;
|
||||
*input_data = ps3input;
|
||||
}
|
||||
|
||||
static enum gfx_ctx_api gfx_ctx_psl1ght_get_api(void *data) { return ps3_api; }
|
||||
|
||||
static bool gfx_ctx_psl1ght_bind_api(void *data,
|
||||
enum gfx_ctx_api api, unsigned major, unsigned minor)
|
||||
{
|
||||
ps3_api = api;
|
||||
if (api == GFX_CTX_RSX_API)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_get_video_output_size(void *data,
|
||||
unsigned *width, unsigned *height, char *desc, size_t desc_len)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
if (!global)
|
||||
return;
|
||||
|
||||
gfx_ctx_psl1ght_get_resolution(global->console.screen.resolutions.current.id,
|
||||
width, height);
|
||||
|
||||
if (*width == 720 && *height == 576)
|
||||
{
|
||||
if (global->console.screen.pal_enable)
|
||||
global->console.screen.pal60_enable = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
global->console.screen.pal_enable = false;
|
||||
global->console.screen.pal60_enable = false;
|
||||
}
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_get_video_output_prev(void *data)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
if (!global)
|
||||
return;
|
||||
|
||||
if (global->console.screen.resolutions.current.idx)
|
||||
{
|
||||
global->console.screen.resolutions.current.idx--;
|
||||
global->console.screen.resolutions.current.id =
|
||||
global->console.screen.resolutions.list
|
||||
[global->console.screen.resolutions.current.idx];
|
||||
}
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_get_video_output_next(void *data)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
if (!global)
|
||||
return;
|
||||
|
||||
if (global->console.screen.resolutions.current.idx + 1 <
|
||||
global->console.screen.resolutions.count)
|
||||
{
|
||||
global->console.screen.resolutions.current.idx++;
|
||||
global->console.screen.resolutions.current.id =
|
||||
global->console.screen.resolutions.list
|
||||
[global->console.screen.resolutions.current.idx];
|
||||
}
|
||||
}
|
||||
|
||||
static uint32_t gfx_ctx_psl1ght_get_flags(void *data)
|
||||
{
|
||||
uint32_t flags = 0;
|
||||
|
||||
#ifdef HAVE_CG
|
||||
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_CG);
|
||||
#endif
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
static void gfx_ctx_psl1ght_set_flags(void *data, uint32_t flags) { }
|
||||
|
||||
const gfx_ctx_driver_t gfx_ctx_psl1ght = {
|
||||
gfx_ctx_psl1ght_init,
|
||||
gfx_ctx_psl1ght_destroy,
|
||||
gfx_ctx_psl1ght_get_api,
|
||||
gfx_ctx_psl1ght_bind_api,
|
||||
gfx_ctx_psl1ght_set_swap_interval,
|
||||
gfx_ctx_psl1ght_set_video_mode,
|
||||
gfx_ctx_psl1ght_get_video_size,
|
||||
NULL, /* get_refresh_rate */
|
||||
gfx_ctx_psl1ght_get_video_output_size,
|
||||
gfx_ctx_psl1ght_get_video_output_prev,
|
||||
gfx_ctx_psl1ght_get_video_output_next,
|
||||
NULL, /* get_metrics */
|
||||
NULL,
|
||||
NULL, /* update_title */
|
||||
gfx_ctx_psl1ght_check_window,
|
||||
NULL, /* set_resize */
|
||||
gfx_ctx_psl1ght_has_focus,
|
||||
gfx_ctx_psl1ght_suppress_screensaver,
|
||||
false, /* has_windowed */
|
||||
gfx_ctx_psl1ght_swap_buffers,
|
||||
gfx_ctx_psl1ght_input_driver,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
"psl1ght",
|
||||
gfx_ctx_psl1ght_get_flags,
|
||||
gfx_ctx_psl1ght_set_flags,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
@ -120,12 +120,8 @@ static const gfx_ctx_driver_t *gfx_ctx_gl_drivers[] = {
|
||||
&vita_ctx,
|
||||
#endif
|
||||
#if defined(__PS3__)
|
||||
#if defined(__PSL1GHT__)
|
||||
&gfx_ctx_psl1ght,
|
||||
#else
|
||||
&gfx_ctx_ps3,
|
||||
#endif
|
||||
#endif
|
||||
#if defined(HAVE_LIBNX) && defined(HAVE_OPENGL)
|
||||
&switch_ctx,
|
||||
#endif
|
||||
|
||||
@ -277,8 +277,6 @@ VIDEO CONTEXT
|
||||
#include "../gfx/drivers_context/qnx_ctx.c"
|
||||
#elif defined(EMSCRIPTEN)
|
||||
#include "../gfx/drivers_context/emscriptenegl_ctx.c"
|
||||
#elif defined(__PSL1GHT__)
|
||||
#include "../gfx/drivers_context/psl1ght_ctx.c"
|
||||
#elif defined(__PS3__)
|
||||
#include "../gfx/drivers_context/ps3_ctx.c"
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user