Removed unneeded files
Removed files that are not used in any configuration
This commit is contained in:
Dimitris Panokostas
parent
bcbf4471cb
commit
b97d7b7af8
11 changed files with 57 additions and 1436 deletions
|
|
@ -8,12 +8,18 @@ Global
|
|||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|VisualGDB = Debug|VisualGDB
|
||||
Release|VisualGDB = Release|VisualGDB
|
||||
Release-rpi1|VisualGDB = Release-rpi1|VisualGDB
|
||||
Release-rpi2|VisualGDB = Release-rpi2|VisualGDB
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release|VisualGDB.Build.0 = Release|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi1|VisualGDB.ActiveCfg = Release-rpi1|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi1|VisualGDB.Build.0 = Release-rpi1|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi2|VisualGDB.ActiveCfg = Release-rpi2|VisualGDB
|
||||
{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi2|VisualGDB.Build.0 = Release-rpi2|VisualGDB
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -78,28 +78,17 @@
|
|||
<EnableNonStopMode>false</EnableNonStopMode>
|
||||
</AdditionalGDBSettings>
|
||||
<LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
|
||||
<GDBEnvironment>
|
||||
<Records>
|
||||
<Record>
|
||||
<VariableName>LANG</VariableName>
|
||||
<Value>en_US.UTF-8</Value>
|
||||
</Record>
|
||||
<Record>
|
||||
<VariableName>PATH</VariableName>
|
||||
<Value>C:\SysGCC\raspberry\bin;%PATH%</Value>
|
||||
</Record>
|
||||
</Records>
|
||||
</GDBEnvironment>
|
||||
<DebuggedProgram>$(TargetPath)</DebuggedProgram>
|
||||
<GDBServerPort>2000</GDBServerPort>
|
||||
<ProgramArguments />
|
||||
</LaunchGDBSettings>
|
||||
<GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
|
||||
<DeploymentTargetPath>/tmp/$(TargetFileName)</DeploymentTargetPath>
|
||||
<DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
|
||||
<X11WindowMode>Local</X11WindowMode>
|
||||
<KeepConsoleAfterExit>false</KeepConsoleAfterExit>
|
||||
<RunGDBUnderSudo>false</RunGDBUnderSudo>
|
||||
<DeploymentMode>Auto</DeploymentMode>
|
||||
<LdLibraryPath />
|
||||
<DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
|
||||
</Debug>
|
||||
<CustomBuild>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,14 @@
|
|||
<Configuration>Debug</Configuration>
|
||||
<Platform>VisualGDB</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release-rpi1|VisualGDB">
|
||||
<Configuration>Release-rpi1</Configuration>
|
||||
<Platform>VisualGDB</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release-rpi2|VisualGDB">
|
||||
<Configuration>Release-rpi2</Configuration>
|
||||
<Platform>VisualGDB</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|VisualGDB">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>VisualGDB</Platform>
|
||||
|
|
@ -27,12 +35,18 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
|
||||
<Toolchain>C:\SysGCC\raspberry</Toolchain>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'">
|
||||
<Toolchain>C:\SysGCC\raspberry</Toolchain>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'">
|
||||
<Toolchain>C:\SysGCC\raspberry</Toolchain>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
|
||||
<ClCompile>
|
||||
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
|
||||
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARM_ASSEMBLY;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalOptions>-mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
|
||||
|
|
@ -45,7 +59,8 @@
|
|||
<ClCompile>
|
||||
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
|
||||
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARM_ASSEMBLY;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
|
||||
|
|
@ -54,6 +69,36 @@
|
|||
<LinkerScript />
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'">
|
||||
<ClCompile>
|
||||
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
|
||||
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalOptions>-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
|
||||
<LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
|
||||
<AdditionalLibraryNames>bcm_host;SDL;pthread;m;z;SDL_image;png;rt;xml2;FLAC;mpg123;dl;SDL_ttf;guichan_sdl;guichan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
|
||||
<LinkerScript>
|
||||
</LinkerScript>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'">
|
||||
<ClCompile>
|
||||
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
|
||||
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;PICASSO96;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalOptions>-march=armv6zk -mfpu=vfp -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
|
||||
<LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
|
||||
<AdditionalLibraryNames>bcm_host;SDL;pthread;m;z;SDL_image;png;rt;xml2;FLAC;mpg123;dl;SDL_ttf;guichan_sdl;guichan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
|
||||
<LinkerScript>
|
||||
</LinkerScript>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\src\filesys.asm" />
|
||||
<None Include="..\..\src\inputevents.def" />
|
||||
|
|
|
|||
|
|
@ -1,212 +0,0 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <EGL/egl.h>
|
||||
#include <GLES/gl.h>
|
||||
#include "gl_platform.h"
|
||||
#include "gl.h"
|
||||
|
||||
static EGLDisplay edpy;
|
||||
static EGLSurface esfc;
|
||||
static EGLContext ectxt;
|
||||
|
||||
/* for external flips */
|
||||
void *gl_es_display;
|
||||
void *gl_es_surface;
|
||||
|
||||
static int gl_have_error(const char *name)
|
||||
{
|
||||
GLenum e = glGetError();
|
||||
if (e != GL_NO_ERROR)
|
||||
{
|
||||
printf("GL error: %s %x\n", name, e);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gles_have_error(const char *name)
|
||||
{
|
||||
EGLint e = eglGetError();
|
||||
if (e != EGL_SUCCESS)
|
||||
{
|
||||
printf("%s %x\n", name, e);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int gl_init(void *display, void *window, int *quirks)
|
||||
{
|
||||
EGLConfig ecfg = NULL;
|
||||
GLuint texture_name = 0;
|
||||
void *tmp_texture_mem = NULL;
|
||||
EGLint num_config;
|
||||
int retval = -1;
|
||||
int ret;
|
||||
EGLint attr[] =
|
||||
{
|
||||
EGL_NONE
|
||||
};
|
||||
|
||||
ret = gl_platform_init(&display, &window, quirks);
|
||||
if (ret != 0)
|
||||
{
|
||||
printf("gl_platform_init failed with %d\n", ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
tmp_texture_mem = calloc(1, 1024 * 512 * 2);
|
||||
if (tmp_texture_mem == NULL)
|
||||
{
|
||||
printf("OOM\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
edpy = eglGetDisplay((EGLNativeDisplayType)display);
|
||||
if (edpy == EGL_NO_DISPLAY)
|
||||
{
|
||||
printf("Failed to get EGL display\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!eglInitialize(edpy, NULL, NULL))
|
||||
{
|
||||
printf("Failed to initialize EGL\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!eglChooseConfig(edpy, attr, &ecfg, 1, &num_config))
|
||||
{
|
||||
printf("Failed to choose config (%x)\n", eglGetError());
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (ecfg == NULL || num_config == 0)
|
||||
{
|
||||
printf("No EGL configs available\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
esfc = eglCreateWindowSurface(edpy, ecfg,
|
||||
(EGLNativeWindowType)window, NULL);
|
||||
if (esfc == EGL_NO_SURFACE)
|
||||
{
|
||||
printf("Unable to create EGL surface (%x)\n",
|
||||
eglGetError());
|
||||
goto out;
|
||||
}
|
||||
|
||||
ectxt = eglCreateContext(edpy, ecfg, EGL_NO_CONTEXT, NULL);
|
||||
if (ectxt == EGL_NO_CONTEXT)
|
||||
{
|
||||
printf("Unable to create EGL context (%x)\n",
|
||||
eglGetError());
|
||||
goto out;
|
||||
}
|
||||
|
||||
eglMakeCurrent(edpy, esfc, esfc, ectxt);
|
||||
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
glGenTextures(1, &texture_name);
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, texture_name);
|
||||
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1024, 512, 0, GL_RGB,
|
||||
GL_UNSIGNED_SHORT_5_6_5, tmp_texture_mem);
|
||||
if (gl_have_error("glTexImage2D"))
|
||||
goto out;
|
||||
|
||||
// no mipmaps
|
||||
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
|
||||
//glViewport(0, 0, 512, 512);
|
||||
glLoadIdentity();
|
||||
glFrontFace(GL_CW);
|
||||
glEnable(GL_CULL_FACE);
|
||||
|
||||
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
glEnableClientState(GL_VERTEX_ARRAY);
|
||||
|
||||
if (gl_have_error("init"))
|
||||
goto out;
|
||||
|
||||
gl_es_display = (void *)edpy;
|
||||
gl_es_surface = (void *)esfc;
|
||||
retval = 0;
|
||||
out:
|
||||
free(tmp_texture_mem);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static float vertices[] =
|
||||
{
|
||||
-1.0f, 1.0f, 0.0f, // 0 0 1
|
||||
1.0f, 1.0f, 0.0f, // 1 ^
|
||||
-1.0f, -1.0f, 0.0f, // 2 | 2 3
|
||||
1.0f, -1.0f, 0.0f, // 3 +-->
|
||||
};
|
||||
|
||||
static float texture[] =
|
||||
{
|
||||
0.0f, 0.0f, // we flip this:
|
||||
1.0f, 0.0f, // v^
|
||||
0.0f, 1.0f, // | u
|
||||
1.0f, 1.0f, // +-->
|
||||
};
|
||||
|
||||
int gl_flip(const void *fb, int w, int h)
|
||||
{
|
||||
static int old_w, old_h;
|
||||
|
||||
if (fb != NULL)
|
||||
{
|
||||
if (w != old_w || h != old_h)
|
||||
{
|
||||
float f_w = (float)w / 1024.0f;
|
||||
float f_h = (float)h / 512.0f;
|
||||
texture[1*2 + 0] = f_w;
|
||||
texture[2*2 + 1] = f_h;
|
||||
texture[3*2 + 0] = f_w;
|
||||
texture[3*2 + 1] = f_h;
|
||||
old_w = w;
|
||||
old_h = h;
|
||||
}
|
||||
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h,
|
||||
GL_RGB, GL_UNSIGNED_SHORT_5_6_5, fb);
|
||||
if (gl_have_error("glTexSubImage2D"))
|
||||
return -1;
|
||||
}
|
||||
|
||||
glVertexPointer(3, GL_FLOAT, 0, vertices);
|
||||
glTexCoordPointer(2, GL_FLOAT, 0, texture);
|
||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
||||
|
||||
if (gl_have_error("glDrawArrays"))
|
||||
return -1;
|
||||
|
||||
eglSwapBuffers(edpy, esfc);
|
||||
if (gles_have_error("eglSwapBuffers"))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void gl_finish(void)
|
||||
{
|
||||
eglMakeCurrent(edpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|
||||
eglDestroyContext(edpy, ectxt);
|
||||
ectxt = EGL_NO_CONTEXT;
|
||||
eglDestroySurface(edpy, esfc);
|
||||
esfc = EGL_NO_SURFACE;
|
||||
eglTerminate(edpy);
|
||||
edpy = EGL_NO_DISPLAY;
|
||||
|
||||
gl_es_display = (void *)edpy;
|
||||
gl_es_surface = (void *)esfc;
|
||||
|
||||
gl_platform_finish();
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
#ifndef LIBPICOFE_GL_H
|
||||
#define LIBPICOFE_GL_H
|
||||
|
||||
#ifdef HAVE_GLES
|
||||
|
||||
int gl_init(void *display, void *window, int *quirks);
|
||||
int gl_flip(const void *fb, int w, int h);
|
||||
void gl_finish(void);
|
||||
|
||||
/* for external flips */
|
||||
extern void *gl_es_display;
|
||||
extern void *gl_es_surface;
|
||||
|
||||
#else
|
||||
|
||||
static __inline int gl_init(void *display, void *window, int *quirks)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
static __inline int gl_flip(const void *fb, int w, int h)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
static __inline void gl_finish(void)
|
||||
{
|
||||
}
|
||||
|
||||
#define gl_es_display (void *)0
|
||||
#define gl_es_surface (void *)0
|
||||
|
||||
#endif
|
||||
|
||||
#define GL_QUIRK_ACTIVATE_RECREATE 1
|
||||
|
||||
#endif // LIBPICOFE_GL_H
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <EGL/egl.h>
|
||||
#include <GLES/gl.h>
|
||||
|
||||
#include "gl.h"
|
||||
#include "gl_platform.h"
|
||||
|
||||
#ifdef VCOS_VERSION
|
||||
|
||||
/*
|
||||
* hacks for Broadcom VideoCore / Raspberry Pi..
|
||||
* Why do I have to do this proprietary API stuff,
|
||||
* couldn't they implement EGL properly? D:
|
||||
*/
|
||||
#include <bcm_host.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
static Display *x11display;
|
||||
static Window x11window;
|
||||
static DISPMANX_DISPLAY_HANDLE_T m_dispmanDisplay;
|
||||
static EGL_DISPMANX_WINDOW_T m_nativeWindow;
|
||||
|
||||
static void *x11lib;
|
||||
#define FPTR(f) typeof(f) * p##f
|
||||
static FPTR(XGetGeometry);
|
||||
static FPTR(XGetWindowAttributes);
|
||||
static FPTR(XTranslateCoordinates);
|
||||
|
||||
static void get_window_rect(VC_RECT_T *rect)
|
||||
{
|
||||
XWindowAttributes xattrs_root;
|
||||
uint32_t disp_w = 0, disp_h = 0;
|
||||
int dx = 0, dy = 0;
|
||||
unsigned int dw = 0, dh = 0, dummy;
|
||||
Window root, dummyw;
|
||||
|
||||
graphics_get_display_size(0, &disp_w, &disp_h);
|
||||
if (disp_w == 0 || disp_h == 0)
|
||||
fprintf(stderr, "ERROR: graphics_get_display_size is broken\n");
|
||||
|
||||
// default to fullscreen
|
||||
// Chips: rpi cut border when full screen...
|
||||
#if 1
|
||||
rect->x = (disp_w*2)/100;
|
||||
rect->y = 0;
|
||||
rect->width = disp_w - (disp_w*2)/100;
|
||||
rect->height = disp_h - (disp_h*2)/100;
|
||||
#else
|
||||
rect->x = rect->y = 0;
|
||||
rect->width = disp_w;
|
||||
rect->height = disp_h;
|
||||
#endif
|
||||
|
||||
if (x11display == NULL || x11window == 0)
|
||||
return; // use fullscreen
|
||||
|
||||
pXGetGeometry(x11display, x11window, &root, &dx, &dy, &dw, &dh,
|
||||
&dummy, &dummy);
|
||||
pXGetWindowAttributes(x11display, root, &xattrs_root);
|
||||
|
||||
if (dw == xattrs_root.width && dh == xattrs_root.height)
|
||||
return; // use fullscreen
|
||||
|
||||
pXTranslateCoordinates(x11display, x11window, root,
|
||||
dx, dy, &dx, &dy, &dummyw);
|
||||
|
||||
// how to deal with that weird centering thing?
|
||||
// this is not quite right..
|
||||
dx += (disp_w - xattrs_root.width) / 2;
|
||||
dy += (disp_h - xattrs_root.height) / 2;
|
||||
|
||||
rect->x = dx;
|
||||
rect->y = dy;
|
||||
rect->width = dw;
|
||||
rect->height = dh;
|
||||
}
|
||||
|
||||
static void submit_rect(void)
|
||||
{
|
||||
DISPMANX_UPDATE_HANDLE_T m_dispmanUpdate;
|
||||
DISPMANX_ELEMENT_HANDLE_T m_dispmanElement;
|
||||
VC_RECT_T srcRect = { 0, }; // unused, but we segfault without passing it??
|
||||
VC_RECT_T dstRect;
|
||||
|
||||
get_window_rect(&dstRect);
|
||||
|
||||
m_dispmanDisplay = vc_dispmanx_display_open(0);
|
||||
m_dispmanUpdate = vc_dispmanx_update_start(0);
|
||||
|
||||
m_dispmanElement = vc_dispmanx_element_add(m_dispmanUpdate,
|
||||
m_dispmanDisplay, 0, &dstRect, 0, &srcRect,
|
||||
DISPMANX_PROTECTION_NONE, 0, 0, DISPMANX_NO_ROTATE);
|
||||
|
||||
m_nativeWindow.element = m_dispmanElement;
|
||||
m_nativeWindow.width = dstRect.width;
|
||||
m_nativeWindow.height = dstRect.height;
|
||||
|
||||
vc_dispmanx_update_submit_sync(m_dispmanUpdate);
|
||||
}
|
||||
|
||||
int gl_platform_init(void **display, void **window, int *quirks)
|
||||
{
|
||||
x11display = NULL;
|
||||
x11window = 0;
|
||||
|
||||
x11lib = dlopen("libX11.so.6", RTLD_LAZY);
|
||||
if (x11lib != NULL)
|
||||
{
|
||||
pXGetGeometry = dlsym(x11lib, "XGetGeometry");
|
||||
pXGetWindowAttributes = dlsym(x11lib, "XGetWindowAttributes");
|
||||
pXTranslateCoordinates = dlsym(x11lib, "XTranslateCoordinates");
|
||||
if (pXGetGeometry != NULL && pXGetWindowAttributes != NULL
|
||||
&& pXTranslateCoordinates != NULL)
|
||||
{
|
||||
x11display = *display;
|
||||
x11window = (Window)*window;
|
||||
}
|
||||
}
|
||||
|
||||
bcm_host_init();
|
||||
submit_rect();
|
||||
|
||||
*display = EGL_DEFAULT_DISPLAY;
|
||||
*window = &m_nativeWindow;
|
||||
*quirks |= GL_QUIRK_ACTIVATE_RECREATE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void gl_platform_finish(void)
|
||||
{
|
||||
vc_dispmanx_display_close(m_dispmanDisplay);
|
||||
bcm_host_deinit();
|
||||
|
||||
if (x11lib)
|
||||
{
|
||||
dlclose(x11lib);
|
||||
x11lib = NULL;
|
||||
}
|
||||
|
||||
x11display = NULL;
|
||||
x11window = 0;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int gl_platform_init(void **display, void **window, int *quirks)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void gl_platform_finish(void)
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
int gl_platform_init(void **display, void **window, int *quirks);
|
||||
void gl_platform_finish(void);
|
||||
|
|
@ -1,805 +0,0 @@
|
|||
#include "sysconfig.h"
|
||||
#include "sysdeps.h"
|
||||
#include "config.h"
|
||||
#include "uae.h"
|
||||
#include "options.h"
|
||||
#include "gui.h"
|
||||
#include "include/memory.h"
|
||||
#include "newcpu.h"
|
||||
#include "inputdevice.h"
|
||||
#include "custom.h"
|
||||
#include "xwin.h"
|
||||
#include "drawing.h"
|
||||
#include "savestate.h"
|
||||
#include "picasso96.h"
|
||||
|
||||
#include <png.h>
|
||||
#include <SDL.h>
|
||||
#include <SDL_image.h>
|
||||
#include <SDL_gfxPrimitives.h>
|
||||
#ifdef ANDROIDSDL
|
||||
#include <android/log.h>
|
||||
#endif
|
||||
#include "gl.h"
|
||||
#include <SDL_syswm.h>
|
||||
|
||||
/* SDL surface variable for output of emulation */
|
||||
SDL_Surface *prSDLScreen = NULL;
|
||||
/* Dummy SDL variable for screen init */
|
||||
SDL_Surface *Dummy_prSDLScreen = NULL;
|
||||
static SDL_Surface *current_screenshot = NULL;
|
||||
/* Possible screen modes (x and y resolutions) */
|
||||
#define MAX_SCREEN_MODES 6
|
||||
static int x_size_table[MAX_SCREEN_MODES] = { 640, 640, 800, 1024, 1152, 1280 };
|
||||
static int y_size_table[MAX_SCREEN_MODES] = { 400, 480, 480, 768, 864, 960 };
|
||||
|
||||
static int red_bits, green_bits, blue_bits;
|
||||
static int red_shift, green_shift, blue_shift;
|
||||
|
||||
struct PicassoResolution *DisplayModes;
|
||||
struct MultiDisplay Displays[MAX_DISPLAYS];
|
||||
|
||||
int screen_is_picasso = 0;
|
||||
|
||||
static int curr_layer_width = 0;
|
||||
|
||||
static char vid_drv_name[32];
|
||||
static void *display, *window;
|
||||
static int gl_quirks;
|
||||
|
||||
static char screenshot_filename_default[255]=
|
||||
{
|
||||
'/', 't', 'm', 'p', '/', 'n', 'u', 'l', 'l', '.', 'p', 'n', 'g', '\0'
|
||||
};
|
||||
char *screenshot_filename=(char *)&screenshot_filename_default[0];
|
||||
FILE *screenshot_file=NULL;
|
||||
static void CreateScreenshot(void);
|
||||
static int save_thumb(char *path);
|
||||
int delay_savestate_frame = 0;
|
||||
|
||||
int justClicked = 0;
|
||||
int mouseMoving = 0;
|
||||
int fcounter = 0;
|
||||
int doStylusRightClick = 0;
|
||||
|
||||
static unsigned long previous_synctime = 0;
|
||||
static unsigned long next_synctime = 0;
|
||||
|
||||
|
||||
unsigned char current_resource_amigafb = 0;
|
||||
|
||||
|
||||
int graphics_setup (void)
|
||||
{
|
||||
#ifdef PICASSO96
|
||||
picasso_InitResolutions();
|
||||
InitPicasso96();
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void InitAmigaVidMode(struct uae_prefs *p)
|
||||
{
|
||||
/* Initialize structure for Amiga video modes */
|
||||
gfxvidinfo.pixbytes = 2;
|
||||
gfxvidinfo.bufmem = (uae_u8 *)prSDLScreen->pixels;
|
||||
gfxvidinfo.outwidth = p->gfx_size.width;
|
||||
gfxvidinfo.outheight = p->gfx_size.height;
|
||||
#ifdef PICASSO96
|
||||
if(screen_is_picasso)
|
||||
{
|
||||
gfxvidinfo.outwidth = picasso_vidinfo.width;
|
||||
//gfxvidinfo.outheight = picasso_vidinfo.height;
|
||||
}
|
||||
#endif
|
||||
gfxvidinfo.rowbytes = prSDLScreen->pitch;
|
||||
//gfxvidinfo.rowbytes = blit_rect.width * 2;
|
||||
}
|
||||
|
||||
void graphics_dispmanshutdown (void)
|
||||
{
|
||||
printf("dispmanshutdown\n");
|
||||
}
|
||||
|
||||
|
||||
void graphics_subshutdown (void)
|
||||
{
|
||||
gl_finish();
|
||||
// Dunno if below lines are usefull for Rpi...
|
||||
//SDL_FreeSurface(prSDLScreen);
|
||||
//prSDLScreen = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static void open_screen(struct uae_prefs *p)
|
||||
{
|
||||
int width;
|
||||
int height;
|
||||
SDL_SysWMinfo wminfo;
|
||||
int ret;
|
||||
int gl_works = 0;
|
||||
|
||||
|
||||
#ifdef PICASSO96
|
||||
if (screen_is_picasso)
|
||||
{
|
||||
width = picasso_vidinfo.width;
|
||||
height = picasso_vidinfo.height;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
p->gfx_resolution = p->gfx_size.width > 600 ? 1 : 0;
|
||||
width = p->gfx_size.width;
|
||||
height = p->gfx_size.height;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(Dummy_prSDLScreen == NULL )
|
||||
{
|
||||
const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo ();
|
||||
printf("DispmanX: Current resolution: %d x %d %d bpp\n",videoInfo->current_w, videoInfo->current_h, videoInfo->vfmt->BitsPerPixel);
|
||||
//Dummy_prSDLScreen = SDL_SetVideoMode(videoInfo->current_w,videoInfo->current_h,16,SDL_SWSURFACE |SDL_FULLSCREEN);
|
||||
Dummy_prSDLScreen = SDL_SetVideoMode(800,480,16,SDL_SWSURFACE );
|
||||
}
|
||||
|
||||
SDL_ShowCursor(SDL_DISABLE);
|
||||
|
||||
printf("Emulation resolution: Width %i Height: %i\n",width,height);
|
||||
prSDLScreen = SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,16,
|
||||
Dummy_prSDLScreen->format->Rmask,
|
||||
Dummy_prSDLScreen->format->Gmask,
|
||||
Dummy_prSDLScreen->format->Bmask,
|
||||
Dummy_prSDLScreen->format->Amask);
|
||||
|
||||
|
||||
// get x11 display/window for GL
|
||||
SDL_VideoDriverName(vid_drv_name, sizeof(vid_drv_name));
|
||||
#ifdef SDL_VIDEO_DRIVER_X11
|
||||
if (strcmp(vid_drv_name, "x11") == 0)
|
||||
{
|
||||
SDL_VERSION(&wminfo.version);
|
||||
ret = SDL_GetWMInfo(&wminfo);
|
||||
if (ret > 0)
|
||||
{
|
||||
display = wminfo.info.x11.display;
|
||||
window = (void *)wminfo.info.x11.window;
|
||||
}
|
||||
}
|
||||
#else
|
||||
(void)wminfo;
|
||||
#endif
|
||||
ret = gl_init(display, window, &gl_quirks);
|
||||
if (ret == 0)
|
||||
{
|
||||
gl_works = 1;
|
||||
}
|
||||
|
||||
|
||||
if(prSDLScreen != NULL)
|
||||
{
|
||||
InitAmigaVidMode(p);
|
||||
init_row_map();
|
||||
}
|
||||
//framecnt = 1; // Don't draw frame before reset done
|
||||
}
|
||||
|
||||
|
||||
void update_display(struct uae_prefs *p)
|
||||
{
|
||||
open_screen(p);
|
||||
|
||||
SDL_ShowCursor(SDL_DISABLE);
|
||||
|
||||
framecnt = 1; // Don't draw frame before reset done
|
||||
}
|
||||
|
||||
|
||||
int check_prefs_changed_gfx (void)
|
||||
{
|
||||
int changed = 0;
|
||||
|
||||
if(currprefs.gfx_size.height != changed_prefs.gfx_size.height ||
|
||||
currprefs.gfx_size.width != changed_prefs.gfx_size.width ||
|
||||
currprefs.gfx_size_fs.width != changed_prefs.gfx_size_fs.width ||
|
||||
currprefs.gfx_resolution != changed_prefs.gfx_resolution)
|
||||
{
|
||||
cfgfile_configuration_change(1);
|
||||
currprefs.gfx_size.height = changed_prefs.gfx_size.height;
|
||||
currprefs.gfx_size.width = changed_prefs.gfx_size.width;
|
||||
currprefs.gfx_size_fs.width = changed_prefs.gfx_size_fs.width;
|
||||
currprefs.gfx_resolution = changed_prefs.gfx_resolution;
|
||||
update_display(&currprefs);
|
||||
changed = 1;
|
||||
}
|
||||
if (currprefs.leds_on_screen != changed_prefs.leds_on_screen ||
|
||||
currprefs.pandora_hide_idle_led != changed_prefs.pandora_hide_idle_led ||
|
||||
currprefs.pandora_vertical_offset != changed_prefs.pandora_vertical_offset)
|
||||
{
|
||||
currprefs.leds_on_screen = changed_prefs.leds_on_screen;
|
||||
currprefs.pandora_hide_idle_led = changed_prefs.pandora_hide_idle_led;
|
||||
currprefs.pandora_vertical_offset = changed_prefs.pandora_vertical_offset;
|
||||
changed = 1;
|
||||
}
|
||||
if (currprefs.chipset_refreshrate != changed_prefs.chipset_refreshrate)
|
||||
{
|
||||
currprefs.chipset_refreshrate = changed_prefs.chipset_refreshrate;
|
||||
init_hz_full ();
|
||||
changed = 1;
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
|
||||
int lockscr (void)
|
||||
{
|
||||
//SDL_LockSurface(prSDLScreen);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void unlockscr (void)
|
||||
{
|
||||
//SDL_UnlockSurface(prSDLScreen);
|
||||
}
|
||||
|
||||
void wait_for_vsync(void)
|
||||
{
|
||||
// Temporary
|
||||
}
|
||||
|
||||
void flush_screen ()
|
||||
{
|
||||
//SDL_UnlockSurface (prSDLScreen);
|
||||
|
||||
|
||||
if (savestate_state == STATE_DOSAVE)
|
||||
{
|
||||
if(delay_savestate_frame > 0)
|
||||
--delay_savestate_frame;
|
||||
else
|
||||
{
|
||||
CreateScreenshot();
|
||||
save_thumb(screenshot_filename);
|
||||
savestate_state = 0;
|
||||
}
|
||||
}
|
||||
|
||||
unsigned long start = read_processor_time();
|
||||
//if(start < next_synctime && next_synctime - start > time_per_frame - 1000)
|
||||
// usleep((next_synctime - start) - 1000);
|
||||
|
||||
gl_flip(gfxvidinfo.bufmem, currprefs.gfx_size.width, currprefs.gfx_size.height);
|
||||
|
||||
|
||||
last_synctime = read_processor_time();
|
||||
|
||||
if(last_synctime - next_synctime > time_per_frame * (1 + currprefs.gfx_framerate) - 1000 || next_synctime < start)
|
||||
adjust_idletime(0);
|
||||
else
|
||||
adjust_idletime(next_synctime - start);
|
||||
|
||||
if(last_synctime - next_synctime > time_per_frame - 5000)
|
||||
next_synctime = last_synctime + time_per_frame * (1 + currprefs.gfx_framerate);
|
||||
else
|
||||
next_synctime = next_synctime + time_per_frame * (1 + currprefs.gfx_framerate);
|
||||
|
||||
init_row_map();
|
||||
|
||||
}
|
||||
|
||||
|
||||
void black_screen_now(void)
|
||||
{
|
||||
SDL_FillRect(Dummy_prSDLScreen,NULL,0);
|
||||
SDL_Flip(Dummy_prSDLScreen);
|
||||
}
|
||||
|
||||
|
||||
static void graphics_subinit (void)
|
||||
{
|
||||
if (prSDLScreen == NULL)
|
||||
{
|
||||
fprintf(stderr, "Unable to set video mode: %s\n", SDL_GetError());
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
SDL_ShowCursor(SDL_DISABLE);
|
||||
|
||||
InitAmigaVidMode(&currprefs);
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_INLINE int bitsInMask (unsigned long mask)
|
||||
{
|
||||
/* count bits in mask */
|
||||
int n = 0;
|
||||
while (mask)
|
||||
{
|
||||
n += mask & 1;
|
||||
mask >>= 1;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
STATIC_INLINE int maskShift (unsigned long mask)
|
||||
{
|
||||
/* determine how far mask is shifted */
|
||||
int n = 0;
|
||||
while (!(mask & 1))
|
||||
{
|
||||
n++;
|
||||
mask >>= 1;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
static int init_colors (void)
|
||||
{
|
||||
int i;
|
||||
int red_bits, green_bits, blue_bits;
|
||||
int red_shift, green_shift, blue_shift;
|
||||
|
||||
/* Truecolor: */
|
||||
red_bits = bitsInMask(prSDLScreen->format->Rmask);
|
||||
green_bits = bitsInMask(prSDLScreen->format->Gmask);
|
||||
blue_bits = bitsInMask(prSDLScreen->format->Bmask);
|
||||
red_shift = maskShift(prSDLScreen->format->Rmask);
|
||||
green_shift = maskShift(prSDLScreen->format->Gmask);
|
||||
blue_shift = maskShift(prSDLScreen->format->Bmask);
|
||||
alloc_colors64k (red_bits, green_bits, blue_bits, red_shift, green_shift, blue_shift, 0);
|
||||
notice_new_xcolors();
|
||||
for (i = 0; i < 4096; i++)
|
||||
xcolors[i] = xcolors[i] * 0x00010001;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Find the colour depth of the display
|
||||
*/
|
||||
static int get_display_depth (void)
|
||||
{
|
||||
const SDL_VideoInfo *vid_info;
|
||||
int depth = 0;
|
||||
|
||||
if ((vid_info = SDL_GetVideoInfo()))
|
||||
{
|
||||
depth = vid_info->vfmt->BitsPerPixel;
|
||||
|
||||
/* Don't trust the answer if it's 16 bits; the display
|
||||
* could actually be 15 bits deep. We'll count the bits
|
||||
* ourselves */
|
||||
if (depth == 16)
|
||||
depth = bitsInMask (vid_info->vfmt->Rmask) + bitsInMask (vid_info->vfmt->Gmask) + bitsInMask (vid_info->vfmt->Bmask);
|
||||
}
|
||||
return depth;
|
||||
}
|
||||
|
||||
int GetSurfacePixelFormat(void)
|
||||
{
|
||||
int depth = get_display_depth();
|
||||
int unit = (depth + 1) & 0xF8;
|
||||
|
||||
return (unit == 8 ? RGBFB_CHUNKY
|
||||
: depth == 15 && unit == 16 ? RGBFB_R5G5B5
|
||||
: depth == 16 && unit == 16 ? RGBFB_R5G6B5
|
||||
: unit == 24 ? RGBFB_B8G8R8
|
||||
: unit == 32 ? RGBFB_R8G8B8A8
|
||||
: RGBFB_NONE);
|
||||
}
|
||||
|
||||
|
||||
int graphics_init (bool mousecapture)
|
||||
{
|
||||
int i,j;
|
||||
|
||||
//uae_sem_init (&vsync_wait_sem, 0, 1);
|
||||
|
||||
graphics_subinit ();
|
||||
|
||||
|
||||
if (!init_colors ())
|
||||
return 0;
|
||||
|
||||
//buttonstate[0] = buttonstate[1] = buttonstate[2] = 0;
|
||||
//keyboard_init();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void graphics_leave (void)
|
||||
{
|
||||
graphics_subshutdown ();
|
||||
SDL_FreeSurface(Dummy_prSDLScreen);
|
||||
SDL_VideoQuit();
|
||||
}
|
||||
|
||||
|
||||
#define systemRedShift (prSDLScreen->format->Rshift)
|
||||
#define systemGreenShift (prSDLScreen->format->Gshift)
|
||||
#define systemBlueShift (prSDLScreen->format->Bshift)
|
||||
#define systemRedMask (prSDLScreen->format->Rmask)
|
||||
#define systemGreenMask (prSDLScreen->format->Gmask)
|
||||
#define systemBlueMask (prSDLScreen->format->Bmask)
|
||||
|
||||
static int save_png(SDL_Surface* surface, char *path)
|
||||
{
|
||||
int w = surface->w;
|
||||
int h = surface->h;
|
||||
unsigned char * pix = (unsigned char *)surface->pixels;
|
||||
unsigned char writeBuffer[1024 * 3];
|
||||
FILE *f = fopen(path,"wb");
|
||||
if(!f) return 0;
|
||||
png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL);
|
||||
if(!png_ptr)
|
||||
{
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
png_infop info_ptr = png_create_info_struct(png_ptr);
|
||||
|
||||
if(!info_ptr)
|
||||
{
|
||||
png_destroy_write_struct(&png_ptr,NULL);
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
png_init_io(png_ptr,f);
|
||||
|
||||
png_set_IHDR(png_ptr,
|
||||
info_ptr,
|
||||
w,
|
||||
h,
|
||||
8,
|
||||
PNG_COLOR_TYPE_RGB,
|
||||
PNG_INTERLACE_NONE,
|
||||
PNG_COMPRESSION_TYPE_DEFAULT,
|
||||
PNG_FILTER_TYPE_DEFAULT);
|
||||
|
||||
png_write_info(png_ptr,info_ptr);
|
||||
|
||||
unsigned char *b = writeBuffer;
|
||||
|
||||
int sizeX = w;
|
||||
int sizeY = h;
|
||||
int y;
|
||||
int x;
|
||||
|
||||
unsigned short *p = (unsigned short *)pix;
|
||||
for(y = 0; y < sizeY; y++)
|
||||
{
|
||||
for(x = 0; x < sizeX; x++)
|
||||
{
|
||||
unsigned short v = p[x];
|
||||
|
||||
*b++ = ((v & systemRedMask ) >> systemRedShift ) << 3; // R
|
||||
*b++ = ((v & systemGreenMask) >> systemGreenShift) << 2; // G
|
||||
*b++ = ((v & systemBlueMask ) >> systemBlueShift ) << 3; // B
|
||||
}
|
||||
p += surface->pitch / 2;
|
||||
png_write_row(png_ptr,writeBuffer);
|
||||
b = writeBuffer;
|
||||
}
|
||||
|
||||
png_write_end(png_ptr, info_ptr);
|
||||
|
||||
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||
|
||||
fclose(f);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static void CreateScreenshot(void)
|
||||
{
|
||||
int w, h;
|
||||
|
||||
if(current_screenshot != NULL)
|
||||
{
|
||||
SDL_FreeSurface(current_screenshot);
|
||||
current_screenshot = NULL;
|
||||
}
|
||||
|
||||
w=prSDLScreen->w;
|
||||
h=prSDLScreen->h;
|
||||
|
||||
current_screenshot = SDL_CreateRGBSurface(prSDLScreen->flags,w,h,prSDLScreen->format->BitsPerPixel,prSDLScreen->format->Rmask,prSDLScreen->format->Gmask,prSDLScreen->format->Bmask,prSDLScreen->format->Amask);
|
||||
SDL_BlitSurface(prSDLScreen, NULL, current_screenshot, NULL);
|
||||
}
|
||||
|
||||
|
||||
static int save_thumb(char *path)
|
||||
{
|
||||
int ret = 0;
|
||||
if(current_screenshot != NULL)
|
||||
{
|
||||
ret = save_png(current_screenshot, path);
|
||||
SDL_FreeSurface(current_screenshot);
|
||||
current_screenshot = NULL;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool vsync_switchmode (int hz)
|
||||
{
|
||||
int changed_height = changed_prefs.gfx_size.height;
|
||||
|
||||
if (hz >= 55)
|
||||
hz = 60;
|
||||
else
|
||||
hz = 50;
|
||||
|
||||
if(hz == 50 && currVSyncRate == 60)
|
||||
{
|
||||
// Switch from NTSC -> PAL
|
||||
switch(changed_height)
|
||||
{
|
||||
case 200:
|
||||
changed_height = 240;
|
||||
break;
|
||||
case 216:
|
||||
changed_height = 262;
|
||||
break;
|
||||
case 240:
|
||||
changed_height = 270;
|
||||
break;
|
||||
case 256:
|
||||
changed_height = 270;
|
||||
break;
|
||||
case 262:
|
||||
changed_height = 270;
|
||||
break;
|
||||
case 270:
|
||||
changed_height = 270;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if(hz == 60 && currVSyncRate == 50)
|
||||
{
|
||||
// Switch from PAL -> NTSC
|
||||
switch(changed_height)
|
||||
{
|
||||
case 200:
|
||||
changed_height = 200;
|
||||
break;
|
||||
case 216:
|
||||
changed_height = 200;
|
||||
break;
|
||||
case 240:
|
||||
changed_height = 200;
|
||||
break;
|
||||
case 256:
|
||||
changed_height = 216;
|
||||
break;
|
||||
case 262:
|
||||
changed_height = 216;
|
||||
break;
|
||||
case 270:
|
||||
changed_height = 240;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(changed_height == currprefs.gfx_size.height && hz == currprefs.chipset_refreshrate)
|
||||
return true;
|
||||
|
||||
changed_prefs.gfx_size.height = changed_height;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool target_graphics_buffer_update (void)
|
||||
{
|
||||
bool rate_changed = 0;
|
||||
//bool rate_changed = SetVSyncRate(currprefs.chipset_refreshrate);
|
||||
|
||||
if(currprefs.gfx_size.height != changed_prefs.gfx_size.height)
|
||||
{
|
||||
update_display(&changed_prefs);
|
||||
rate_changed = true;
|
||||
}
|
||||
|
||||
if(rate_changed)
|
||||
{
|
||||
black_screen_now();
|
||||
fpscounter_reset();
|
||||
time_per_frame = 1000 * 1000 / (currprefs.chipset_refreshrate);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifdef PICASSO96
|
||||
|
||||
int picasso_palette(void)
|
||||
{
|
||||
int i, changed;
|
||||
|
||||
changed = 0;
|
||||
for (i = 0; i < 256; i++)
|
||||
{
|
||||
int r = picasso96_state.CLUT[i].Red;
|
||||
int g = picasso96_state.CLUT[i].Green;
|
||||
int b = picasso96_state.CLUT[i].Blue;
|
||||
int value = (r << 16 | g << 8 | b);
|
||||
uae_u32 v = CONVERT_RGB(value);
|
||||
if (v != picasso_vidinfo.clut[i])
|
||||
{
|
||||
picasso_vidinfo.clut[i] = v;
|
||||
changed = 1;
|
||||
}
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
|
||||
static int resolution_compare (const void *a, const void *b)
|
||||
{
|
||||
struct PicassoResolution *ma = (struct PicassoResolution *)a;
|
||||
struct PicassoResolution *mb = (struct PicassoResolution *)b;
|
||||
if (ma->res.width < mb->res.width)
|
||||
return -1;
|
||||
if (ma->res.width > mb->res.width)
|
||||
return 1;
|
||||
if (ma->res.height < mb->res.height)
|
||||
return -1;
|
||||
if (ma->res.height > mb->res.height)
|
||||
return 1;
|
||||
return ma->depth - mb->depth;
|
||||
}
|
||||
static void sortmodes (void)
|
||||
{
|
||||
int i = 0, idx = -1;
|
||||
int pw = -1, ph = -1;
|
||||
while (DisplayModes[i].depth >= 0)
|
||||
i++;
|
||||
qsort (DisplayModes, i, sizeof (struct PicassoResolution), resolution_compare);
|
||||
for (i = 0; DisplayModes[i].depth >= 0; i++)
|
||||
{
|
||||
if (DisplayModes[i].res.height != ph || DisplayModes[i].res.width != pw)
|
||||
{
|
||||
ph = DisplayModes[i].res.height;
|
||||
pw = DisplayModes[i].res.width;
|
||||
idx++;
|
||||
}
|
||||
DisplayModes[i].residx = idx;
|
||||
}
|
||||
}
|
||||
|
||||
static void modesList (void)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
i = 0;
|
||||
while (DisplayModes[i].depth >= 0)
|
||||
{
|
||||
write_log ("%d: %s (", i, DisplayModes[i].name);
|
||||
j = 0;
|
||||
while (DisplayModes[i].refresh[j] > 0)
|
||||
{
|
||||
if (j > 0)
|
||||
write_log (",");
|
||||
write_log ("%d", DisplayModes[i].refresh[j]);
|
||||
j++;
|
||||
}
|
||||
write_log (")\n");
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
void picasso_InitResolutions (void)
|
||||
{
|
||||
struct MultiDisplay *md1;
|
||||
int i, count = 0;
|
||||
char tmp[200];
|
||||
int bitdepth;
|
||||
|
||||
Displays[0].primary = 1;
|
||||
Displays[0].disabled = 0;
|
||||
Displays[0].rect.left = 0;
|
||||
Displays[0].rect.top = 0;
|
||||
Displays[0].rect.right = 800;
|
||||
Displays[0].rect.bottom = 640;
|
||||
sprintf (tmp, "%s (%d*%d)", "Display", Displays[0].rect.right, Displays[0].rect.bottom);
|
||||
Displays[0].name = my_strdup(tmp);
|
||||
Displays[0].name2 = my_strdup("Display");
|
||||
|
||||
md1 = Displays;
|
||||
DisplayModes = md1->DisplayModes = xmalloc(struct PicassoResolution, MAX_PICASSO_MODES);
|
||||
for (i = 0; i < MAX_SCREEN_MODES && count < MAX_PICASSO_MODES; i++)
|
||||
{
|
||||
for(bitdepth = 16; bitdepth <= 32; bitdepth += 16)
|
||||
{
|
||||
int bit_unit = (bitdepth + 1) & 0xF8;
|
||||
int rgbFormat = (bitdepth == 16 ? RGBFB_R5G6B5 : RGBFB_R8G8B8A8);
|
||||
int pixelFormat = 1 << rgbFormat;
|
||||
pixelFormat |= RGBFF_CHUNKY;
|
||||
|
||||
if (SDL_VideoModeOK (x_size_table[i], y_size_table[i], bitdepth, SDL_SWSURFACE))
|
||||
{
|
||||
DisplayModes[count].res.width = x_size_table[i];
|
||||
DisplayModes[count].res.height = y_size_table[i];
|
||||
DisplayModes[count].depth = bit_unit >> 3;
|
||||
DisplayModes[count].refresh[0] = 50;
|
||||
DisplayModes[count].refresh[1] = 60;
|
||||
DisplayModes[count].refresh[2] = 0;
|
||||
DisplayModes[count].colormodes = pixelFormat;
|
||||
sprintf(DisplayModes[count].name, "%dx%d, %d-bit",
|
||||
DisplayModes[count].res.width, DisplayModes[count].res.height, DisplayModes[count].depth * 8);
|
||||
|
||||
count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
DisplayModes[count].depth = -1;
|
||||
sortmodes();
|
||||
modesList();
|
||||
DisplayModes = Displays[0].DisplayModes;
|
||||
}
|
||||
|
||||
|
||||
void gfx_set_picasso_modeinfo (uae_u32 w, uae_u32 h, uae_u32 depth, RGBFTYPE rgbfmt)
|
||||
{
|
||||
depth >>= 3;
|
||||
if( ((unsigned)picasso_vidinfo.width == w ) &&
|
||||
( (unsigned)picasso_vidinfo.height == h ) &&
|
||||
( (unsigned)picasso_vidinfo.depth == depth ) &&
|
||||
( picasso_vidinfo.selected_rgbformat == rgbfmt) )
|
||||
return;
|
||||
|
||||
picasso_vidinfo.selected_rgbformat = rgbfmt;
|
||||
picasso_vidinfo.width = w;
|
||||
picasso_vidinfo.height = h;
|
||||
picasso_vidinfo.depth = depth;
|
||||
picasso_vidinfo.extra_mem = 1;
|
||||
|
||||
picasso_vidinfo.pixbytes = depth;
|
||||
if (screen_is_picasso)
|
||||
{
|
||||
open_screen(&currprefs);
|
||||
picasso_vidinfo.rowbytes = prSDLScreen->pitch;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void gfx_set_picasso_state (int on)
|
||||
{
|
||||
if (on == screen_is_picasso)
|
||||
return;
|
||||
|
||||
screen_is_picasso = on;
|
||||
open_screen(&currprefs);
|
||||
picasso_vidinfo.rowbytes = prSDLScreen->pitch;
|
||||
}
|
||||
|
||||
uae_u8 *gfx_lock_picasso (void)
|
||||
{
|
||||
// We lock the surface directly after create and flip
|
||||
picasso_vidinfo.rowbytes = prSDLScreen->pitch;
|
||||
return (uae_u8 *)prSDLScreen->pixels;
|
||||
}
|
||||
|
||||
void gfx_unlock_picasso (void)
|
||||
{
|
||||
// We lock the surface directly after create and flip, so no unlock here
|
||||
}
|
||||
|
||||
#endif // PICASSO96
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
@ Some functions and tests to increase performance in drawing.cpp and custom.cpp
|
||||
|
||||
.arm
|
||||
|
||||
.global copy_screen_8bit
|
||||
.global copy_screen_16bit_swap
|
||||
.global copy_screen_32bit_to_16bit
|
||||
|
||||
.text
|
||||
|
||||
.align 8
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_8bit
|
||||
@
|
||||
@ r0: uae_u8 *dst
|
||||
@ r1: uae_u8 *src
|
||||
@ r2: int bytes always a multiple of 64: even number of lines, number of pixel per line is multiple of 32 (320, 640, 800, 1024, 1152, 1280)
|
||||
@ r3: uae_u32 *clut
|
||||
@
|
||||
@ void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_8bit:
|
||||
stmdb sp!, {r4-r6, lr}
|
||||
copy_screen_8bit_loop:
|
||||
pld [r1, #192]
|
||||
mov lr, #64
|
||||
copy_screen_8bit_loop_2:
|
||||
ldr r4, [r1], #4
|
||||
and r5, r4, #255
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
lsr r5, r4, #8
|
||||
and r5, r5, #255
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
lsr r5, r4, #16
|
||||
and r5, r5, #255
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
lsr r5, r4, #24
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
subs lr, lr, #4
|
||||
strh r6, [r0], #2
|
||||
bgt copy_screen_8bit_loop_2
|
||||
subs r2, r2, #64
|
||||
bgt copy_screen_8bit_loop
|
||||
ldmia sp!, {r4-r6, pc}
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_16bit_swap
|
||||
@
|
||||
@ r0: uae_u8 *dst
|
||||
@ r1: uae_u8 *src
|
||||
@ r2: int bytes always a multiple of 128: even number of lines, 2 bytes per pixel, number of pixel per line is multiple of 32 (320, 640, 800, 1024, 1152, 1280)
|
||||
@
|
||||
@ void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_16bit_swap:
|
||||
ldr r3, [r1], #4
|
||||
rev16 r3, r3
|
||||
str r3, [r0], #4
|
||||
subs r2, r2, #4
|
||||
bne copy_screen_16bit_swap
|
||||
bx lr
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_32bit_to_16bit
|
||||
@
|
||||
@ r0: uae_u8 *dst - Format (bits): rrrr rggg gggb bbbb
|
||||
@ r1: uae_u8 *src - Format (bytes) in memory rgba
|
||||
@ r2: int bytes
|
||||
@
|
||||
@ void copy_screen_32bit_to_16bit(uae_u8 *dst, uae_u8 *src, int bytes);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_32bit_to_16bit:
|
||||
stmdb sp!, {r4-r6, lr}
|
||||
copy_screen_32bit_to_16bit_loop:
|
||||
ldr r3, [r1], #4
|
||||
rev r3, r3
|
||||
lsr r4, r3, #27
|
||||
lsr r5, r3, #18
|
||||
and r5, r5, #63
|
||||
lsr r6, r3, #11
|
||||
and r6, r6, #31
|
||||
orr r6, r6, r5, lsl #5
|
||||
orr r6, r6, r4, lsl #11
|
||||
strh r6, [r0], #2
|
||||
subs r2, r2, #4
|
||||
bne copy_screen_32bit_to_16bit_loop
|
||||
ldmia sp!, {r4-r6, pc}
|
||||
|
|
@ -130,7 +130,7 @@ namespace sdl
|
|||
#if defined (RASPBERRY)
|
||||
const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo ();
|
||||
printf("Current resolution: %d x %d %d bpp\n",videoInfo->current_w, videoInfo->current_h, videoInfo->vfmt->BitsPerPixel);
|
||||
gui_screen = SDL_SetVideoMode(videoInfo->current_w, videoInfo->current_h, videoInfo->vfmt->BitsPerPixel, SDL_SWSURFACE);
|
||||
gui_screen = SDL_SetVideoMode(videoInfo->current_w, videoInfo->current_h, 16, SDL_SWSURFACE | SDL_FULLSCREEN);
|
||||
#else
|
||||
gui_screen = SDL_SetVideoMode(GUI_WIDTH, GUI_HEIGHT, 16, SDL_SWSURFACE);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,110 +0,0 @@
|
|||
@ Some functions and tests to increase performance in drawing.cpp and custom.cpp
|
||||
|
||||
.arm
|
||||
|
||||
.global copy_screen_8bit
|
||||
.global copy_screen_16bit_swap
|
||||
.global copy_screen_32bit_to_16bit
|
||||
|
||||
.text
|
||||
|
||||
.align 8
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_8bit
|
||||
@
|
||||
@ r0: uae_u8 *dst
|
||||
@ r1: uae_u8 *src
|
||||
@ r2: int bytes always a multiple of 64: even number of lines, number of pixel per line is multiple of 32 (320, 640, 800, 1024, 1152, 1280)
|
||||
@ r3: uae_u32 *clut
|
||||
@
|
||||
@ void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_8bit:
|
||||
stmdb sp!, {r4-r6, lr}
|
||||
copy_screen_8bit_loop:
|
||||
pld [r1, #192]
|
||||
mov lr, #64
|
||||
copy_screen_8bit_loop_2:
|
||||
ldr r4, [r1], #4
|
||||
and r5, r4, #255
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
ubfx r5, r4, #8, #8
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
ubfx r5, r4, #16, #8
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
ubfx r5, r4, #24, #8
|
||||
strh r6, [r0], #2
|
||||
ldr r6, [r3, r5, lsl #2]
|
||||
subs lr, lr, #4
|
||||
strh r6, [r0], #2
|
||||
bgt copy_screen_8bit_loop_2
|
||||
subs r2, r2, #64
|
||||
bgt copy_screen_8bit_loop
|
||||
ldmia sp!, {r4-r6, pc}
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_16bit_swap
|
||||
@
|
||||
@ r0: uae_u8 *dst
|
||||
@ r1: uae_u8 *src
|
||||
@ r2: int bytes always a multiple of 128: even number of lines, 2 bytes per pixel, number of pixel per line is multiple of 32 (320, 640, 800, 1024, 1152, 1280)
|
||||
@
|
||||
@ void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_16bit_swap:
|
||||
pld [r1, #192]
|
||||
vldmia r1!, {q8, q9}
|
||||
vrev16.8 q8, q8
|
||||
vldmia r1!, {q10}
|
||||
vrev16.8 q9, q9
|
||||
vldmia r1!, {q11}
|
||||
vrev16.8 q10, q10
|
||||
vldmia r1!, {q12}
|
||||
vrev16.8 q11, q11
|
||||
vldmia r1!, {q13}
|
||||
vrev16.8 q12, q12
|
||||
vldmia r1!, {q14}
|
||||
vrev16.8 q13, q13
|
||||
vldmia r1!, {q15}
|
||||
vrev16.8 q14, q14
|
||||
vrev16.8 q15, q15
|
||||
subs r2, r2, #128 @ we handle 16 * 8 bytes per loop
|
||||
vstmia r0!, {q8-q15}
|
||||
bne copy_screen_16bit_swap
|
||||
bx lr
|
||||
|
||||
|
||||
@----------------------------------------------------------------
|
||||
@ copy_screen_32bit_to_16bit_neon
|
||||
@
|
||||
@ r0: uae_u8 *dst - Format (bits): rrrr rggg gggb bbbb
|
||||
@ r1: uae_u8 *src - Format (bytes) in memory rgba
|
||||
@ r2: int bytes
|
||||
@
|
||||
@ void copy_screen_32bit_to_16bit(uae_u8 *dst, uae_u8 *src, int bytes);
|
||||
@
|
||||
@----------------------------------------------------------------
|
||||
copy_screen_32bit_to_16bit_neon:
|
||||
pld [r1, #192]
|
||||
vld4.8 {d18-d21}, [r1]!
|
||||
vld4.8 {d22-d25}, [r1]!
|
||||
vswp d19, d22
|
||||
vswp d21, d24 @ -> q9=r, q10=b, q11=g, q12=a
|
||||
vsri.i8 q9, q11, #5 @ q9: rrrr rggg
|
||||
vshr.u8 q8, q10, #3 @ q8: 000b bbbb
|
||||
vshr.u8 q11, q11, #2 @ q11: 00gg gggg
|
||||
vsli.i8 q8, q11, #5 @ q8: gggb bbbb
|
||||
vswp d17, d18
|
||||
subs r2, r2, #64 @ processd 4 (bytes per pixel) * 16 (pixel)
|
||||
vst2.8 {d16-d17}, [r0]!
|
||||
vst2.8 {d18-d19}, [r0]!
|
||||
bne copy_screen_32bit_to_16bit_neon
|
||||
bx lr
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue