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

Merge remote-tracking branch 'svn/trunk' into git_master

Browse Source
This commit is contained in:
Diederick Niehorster 2014-10-26 17:01:13 +08:00
commit cf4f9c09ba
12 changed files with 12 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeglut/freeglut/CMakeLists.txt
View File

@ -289,11 +289,8 @@ CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)
CHECK_INCLUDE_FILES(sys/param.h HAVE_SYS_PARAM_H) CHECK_INCLUDE_FILES(sys/param.h HAVE_SYS_PARAM_H)
CHECK_INCLUDE_FILES(sys/ioctl.h HAVE_SYS_IOCTL_H) CHECK_INCLUDE_FILES(sys/ioctl.h HAVE_SYS_IOCTL_H)
CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)
CHECK_INCLUDE_FILES(errno.h HAVE_ERRNO_H)
CHECK_INCLUDE_FILES(usbhid.h HAVE_USBHID_H) CHECK_INCLUDE_FILES(usbhid.h HAVE_USBHID_H)
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF)
CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT)
CHECK_FUNCTION_EXISTS(XParseGeometry HAVE_XPARSEGEOMETRY) CHECK_FUNCTION_EXISTS(XParseGeometry HAVE_XPARSEGEOMETRY)
IF (NOT HAVE_XPARSEGEOMETRY) IF (NOT HAVE_XPARSEGEOMETRY)
LIST(APPEND FREEGLUT_SRCS LIST(APPEND FREEGLUT_SRCS

3
freeglut/freeglut/progs/demos/shapes/shapes.c
View File

@ -286,6 +286,7 @@ GLint getAttribOrUniformLocation(const char* name, GLuint program, GLboolean isA
fprintf(stderr, "Warning: Could not bind attrib %s\n", name); fprintf(stderr, "Warning: Could not bind attrib %s\n", name);
} }
checkError ("getAttribOrUniformLocation");
return attrib; return attrib;
} }
else else
@ -296,9 +297,9 @@ GLint getAttribOrUniformLocation(const char* name, GLuint program, GLboolean isA
fprintf(stderr, "Warning: Could not bind uniform %s\n", name); fprintf(stderr, "Warning: Could not bind uniform %s\n", name);
} }
checkError ("getAttribOrUniformLocation");
return uniform; return uniform;
} }
checkError ("getAttribOrUniformLocation");
} }
GLuint program; GLuint program;

10
freeglut/freeglut/src/fg_joystick.c
View File

@ -147,14 +147,12 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
if (cp) if (cp)
return 1; return 1;
} }
#ifdef HAVE_ERRNO_H
else if (errno == EACCES) { else if (errno == EACCES) {
if (!protection_warned) { if (!protection_warned) {
fgWarning ( "Can't open %s for read!", buf ); fgWarning ( "Can't open %s for read!", buf );
protection_warned = 1; protection_warned = 1;
} }
} }
#endif
} }
return 0; return 0;
} }
@ -172,11 +170,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 ) if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
{ {
#ifdef HAVE_ERRNO_H
fgWarning ( "error: %s: %s", os->fname, strerror( errno ) ); fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
#else
fgWarning ( "error: %s", os->fname );
#endif
return FALSE; return FALSE;
} }
@ -186,11 +180,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0) if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
{ {
/*** XXX {report_id} may not be the right variable? ***/ /*** XXX {report_id} may not be the right variable? ***/
#ifdef HAVE_ERRNO_H
fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) ); fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
#else
fgWarning ( "error: %s%d", UHIDDEV, report_id );
#endif
return FALSE; return FALSE;
} }

15
freeglut/freeglut/src/fg_main.c
View File

@ -27,17 +27,8 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "fg_internal.h" #include "fg_internal.h"
#ifdef HAVE_ERRNO_H #include <errno.h>
# include <errno.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#ifdef HAVE_VFPRINTF
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
#elif defined(HAVE__DOPRNT)
# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
#else
# define VFPRINTF(s,f,a)
#endif
/* /*
* Try to get the maximum value allowed for ints, falling back to the minimum * Try to get the maximum value allowed for ints, falling back to the minimum
@ -289,7 +280,7 @@ void fgError( const char *fmt, ... )
fprintf( stderr, "freeglut "); fprintf( stderr, "freeglut ");
if( fgState.ProgramName ) if( fgState.ProgramName )
fprintf( stderr, "(%s): ", fgState.ProgramName ); fprintf( stderr, "(%s): ", fgState.ProgramName );
VFPRINTF( stderr, fmt, ap ); vfprintf( stderr, fmt, ap );
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
va_end( ap ); va_end( ap );
@ -322,7 +313,7 @@ void fgWarning( const char *fmt, ... )
fprintf( stderr, "freeglut "); fprintf( stderr, "freeglut ");
if( fgState.ProgramName ) if( fgState.ProgramName )
fprintf( stderr, "(%s): ", fgState.ProgramName ); fprintf( stderr, "(%s): ", fgState.ProgramName );
VFPRINTF( stderr, fmt, ap ); vfprintf( stderr, fmt, ap );
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
va_end( ap ); va_end( ap );

2
freeglut/freeglut/src/mswin/fg_cursor_mswin.c
View File

@ -143,4 +143,4 @@ void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYU
mouse_pos->X = pos.x; mouse_pos->X = pos.x;
mouse_pos->Y = pos.y; mouse_pos->Y = pos.y;
mouse_pos->Use = GL_TRUE; mouse_pos->Use = GL_TRUE;
} }

4
freeglut/freeglut/src/mswin/fg_internal_mswin.h
View File

@ -48,10 +48,6 @@
#endif #endif
#ifndef HAVE_VFPRINTF
#define HAVE_VFPRINTF 1
#endif
/* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */ /* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
#if !defined(ChangeDisplaySettingsEx) #if !defined(ChangeDisplaySettingsEx)
LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID); LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);

2
freeglut/freeglut/src/mswin/fg_state_mswin.c
View File

@ -345,4 +345,4 @@ int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
{ {
*size = 0; *size = 0;
return NULL; return NULL;
} }

2
freeglut/freeglut/src/x11/fg_input_devices_x11.c
View File

@ -33,9 +33,7 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../fg_internal.h" #include "../fg_internal.h"
#ifdef HAVE_ERRNO_H
#include <errno.h> #include <errno.h>
#endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

8
freeglut/freeglut/src/x11/fg_internal_x11.h
View File

@ -131,10 +131,10 @@ struct tagSFG_PlatformWindowState
# ifdef HAVE_FCNTL_H # ifdef HAVE_FCNTL_H
# include <fcntl.h> # include <fcntl.h>
# endif # endif
# ifdef HAVE_ERRNO_H
# include <errno.h> #include <errno.h>
# include <string.h> #include <string.h>
# endif
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */ /* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1 # define HAVE_USB_JS 1

8
freeglut/freeglut/src/x11/fg_joystick_x11.c
View File

@ -115,11 +115,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
} }
} }
} }
# ifdef HAVE_ERRNO_H
if ( len < 0 && errno != EAGAIN ) if ( len < 0 && errno != EAGAIN )
# else
if ( len < 0 )
# endif
{ {
perror( joy->pJoystick.os->fname ); perror( joy->pJoystick.os->fname );
joy->error = 1; joy->error = 1;
@ -138,7 +134,6 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
if ( status != sizeof( struct js_event ) ) if ( status != sizeof( struct js_event ) )
{ {
# ifdef HAVE_ERRNO_H
if ( errno == EAGAIN ) if ( errno == EAGAIN )
{ {
/* Use the old values */ /* Use the old values */
@ -149,7 +144,6 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
sizeof( float ) * joy->num_axes ); sizeof( float ) * joy->num_axes );
return; return;
} }
# endif
fgWarning ( "%s", joy->pJoystick.fname ); fgWarning ( "%s", joy->pJoystick.fname );
joy->error = GL_TRUE; joy->error = GL_TRUE;
@ -241,10 +235,8 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK); joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);
#ifdef HAVE_ERRNO_H
if( joy->pJoystick.os->fd < 0 && errno == EACCES ) if( joy->pJoystick.os->fd < 0 && errno == EACCES )
fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname ); fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );
#endif
joy->error =( joy->pJoystick.os->fd < 0 ); joy->error =( joy->pJoystick.os->fd < 0 );

13
freeglut/freeglut/src/x11/fg_main_x11.c
View File

@ -28,17 +28,8 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../fg_internal.h" #include "../fg_internal.h"
#ifdef HAVE_ERRNO_H #include <errno.h>
# include <errno.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#ifdef HAVE_VFPRINTF
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
#elif defined(HAVE__DOPRNT)
# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
#else
# define VFPRINTF(s,f,a)
#endif
/* /*
@ -125,10 +116,8 @@ void fgPlatformSleepForEvents( fg_time_t msec )
wait.tv_usec = (msec % 1000) * 1000; wait.tv_usec = (msec % 1000) * 1000;
err = select( socket+1, &fdset, NULL, NULL, &wait ); err = select( socket+1, &fdset, NULL, NULL, &wait );
#ifdef HAVE_ERRNO_H
if( ( -1 == err ) && ( errno != EINTR ) ) if( ( -1 == err ) && ( errno != EINTR ) )
fgWarning ( "freeglut select() error: %d", errno ); fgWarning ( "freeglut select() error: %d", errno );
#endif
} }
} }

3
freeglut/freeglut/src/x11/fg_spaceball_x11.c
View File

@ -174,10 +174,7 @@ OF SUCH DAMAGE.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_ERRNO_H
#include <errno.h> #include <errno.h>
#endif
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>