FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EGL: more code reusability

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1178 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-03-17 12:34:22 +00:00
parent b4115920d4
commit 3ce776e21e
5 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -61,6 +61,7 @@ freeglut/freeglut/src/android/fg_main_android.c -text
freeglut/freeglut/src/android/fg_runtime_android.c -text
freeglut/freeglut/src/android/fg_spaceball_android.c -text
freeglut/freeglut/src/android/fg_state_android.c -text
freeglut/freeglut/src/android/fg_structure_android.c -text
freeglut/freeglut/src/android/fg_window_android.c -text
freeglut/freeglut/src/android/native_app_glue/README -text
freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.c -text
@ -69,6 +70,7 @@ freeglut/freeglut/src/egl/fg_display_egl.c -text
freeglut/freeglut/src/egl/fg_init_egl.c -text
freeglut/freeglut/src/egl/fg_internal_egl.h -text
freeglut/freeglut/src/egl/fg_structure_egl.c -text
freeglut/freeglut/src/egl/fg_structure_egl.h -text
freeglut/freeglut/src/egl/fg_window_egl.c -text
freeglut/freeglut/src/egl/fg_window_egl.h -text
freeglut/freeglut/src/fg_callbacks.c svn_keywords=Author+Date+Id+Revision

2
freeglut/freeglut/CMakeLists.txt
View File

@ -103,12 +103,14 @@ ELSEIF(ANDROID)
src/egl/fg_display_egl.c
src/egl/fg_init_egl.c
src/egl/fg_structure_egl.c
src/egl/fg_structure_egl.h
src/egl/fg_window_egl.c
src/egl/fg_window_egl.h
src/android/native_app_glue/android_native_app_glue.c
src/android/native_app_glue/android_native_app_glue.h
src/android/fg_runtime_android.c
src/android/fg_gamemode_android.c
src/android/fg_structure_android.c
src/android/fg_init_android.c
src/android/fg_input_devices_android.c
src/android/fg_joystick_android.c

36
freeglut/freeglut/src/android/fg_structure_android.c Normal file
View File

@ -0,0 +1,36 @@
/*
* fg_structure_android.c
*
* Windows and menus need tree structure
*
* Copyright (C) 2012 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <GL/freeglut.h>
#include "fg_internal.h"
#include "egl/fg_structure_egl.h"
/**
* Initialize default platform-specific fields in SFG_Window
*/
void fgPlatformCreateWindow ( SFG_Window *window )
{
fghPlatformCreateWindowEGL(window);
}

6
freeglut/freeglut/src/egl/fg_structure_egl.c
View File

@ -1,5 +1,5 @@
/*
* freeglut_structure_egl.c
* fg_structure_egl.c
*
* Windows and menus need tree structure
*
@ -26,12 +26,10 @@
#include <GL/freeglut.h>
#include "fg_internal.h"
extern SFG_Structure fgStructure;
/**
* Initialize default platform-specific fields in SFG_Window
*/
void fgPlatformCreateWindow ( SFG_Window *window )
void fghPlatformCreateWindowEGL ( SFG_Window *window )
{
window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
window->Window.pContext.egl.Config = NULL;

31
freeglut/freeglut/src/egl/fg_structure_egl.h Normal file
View File

@ -0,0 +1,31 @@
/*
* fg_structure_egl.h
*
* Windows and menus need tree structure
*
* Copyright (C) 2012 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FG_STRUCTURE_EGL_H__
#define __FG_STRUCTURE_EGL_H__
extern void fghPlatformCreateWindowEGL ( SFG_Window *window );
#endif