diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-11 01:45:04 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-11 01:45:04 +0000 |
| commit | 2eef2eca872e3fbff5c2876507b4cdff8e86c3a6 (patch) | |
| tree | c14de99510e7da2a6d777e6ac03b98ee3ee0bae0 | |
| parent | 7f8cb30ccc88270eb1d7ca29f9dc69a4b7d540bf (diff) | |
Silence some warnings.
| -rw-r--r-- | include/GL/glfbdev.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/fbdev/glfbdev.c | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/include/GL/glfbdev.h b/include/GL/glfbdev.h index 6af3ac3142..d2b12815c9 100644 --- a/include/GL/glfbdev.h +++ b/include/GL/glfbdev.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.5 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -65,7 +65,7 @@ glFBDevGetString( int str ); typedef void (*GLFBDevProc)(); -extern const GLFBDevProc +extern GLFBDevProc glFBDevGetProcAddress( const char *procName ); diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c index 7f66c46fd9..01b178fb12 100644 --- a/src/mesa/drivers/fbdev/glfbdev.c +++ b/src/mesa/drivers/fbdev/glfbdev.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.5 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -38,6 +38,7 @@ * 24 bits | ? 0x312 0x315 0x318 ? 0x31B 0x31F * 32 bits | ? ? ? ? 0x164 ? */ + #ifdef USE_GLFBDEV_DRIVER #include "glheader.h" @@ -286,7 +287,7 @@ glFBDevGetString( int str ) } -const GLFBDevProc +GLFBDevProc glFBDevGetProcAddress( const char *procName ) { struct name_address { @@ -513,6 +514,7 @@ new_glfbdev_renderbuffer(void *bufferStart, int pixelFormat) rb->Base.GetRow = get_row_B8G8R8; rb->Base.GetValues = get_values_B8G8R8; rb->Base.PutRow = put_row_B8G8R8; + rb->Base.PutRowRGB = put_row_rgb_B8G8R8; rb->Base.PutMonoRow = put_mono_row_B8G8R8; rb->Base.PutValues = put_values_B8G8R8; rb->Base.PutMonoValues = put_mono_values_B8G8R8; @@ -521,6 +523,7 @@ new_glfbdev_renderbuffer(void *bufferStart, int pixelFormat) rb->Base.GetRow = get_row_B8G8R8A8; rb->Base.GetValues = get_values_B8G8R8A8; rb->Base.PutRow = put_row_B8G8R8A8; + rb->Base.PutRowRGB = put_row_rgb_B8G8R8A8; rb->Base.PutMonoRow = put_mono_row_B8G8R8A8; rb->Base.PutValues = put_values_B8G8R8A8; rb->Base.PutMonoValues = put_mono_values_B8G8R8A8; @@ -529,6 +532,7 @@ new_glfbdev_renderbuffer(void *bufferStart, int pixelFormat) rb->Base.GetRow = get_row_B5G6R5; rb->Base.GetValues = get_values_B5G6R5; rb->Base.PutRow = put_row_B5G6R5; + rb->Base.PutRowRGB = put_row_rgb_B5G6R5; rb->Base.PutMonoRow = put_mono_row_B5G6R5; rb->Base.PutValues = put_values_B5G6R5; rb->Base.PutMonoValues = put_mono_values_B5G6R5; @@ -537,6 +541,7 @@ new_glfbdev_renderbuffer(void *bufferStart, int pixelFormat) rb->Base.GetRow = get_row_B5G5R5; rb->Base.GetValues = get_values_B5G5R5; rb->Base.PutRow = put_row_B5G5R5; + rb->Base.PutRowRGB = put_row_rgb_B5G5R5; rb->Base.PutMonoRow = put_mono_row_B5G5R5; rb->Base.PutValues = put_values_B5G5R5; rb->Base.PutMonoValues = put_mono_values_B5G5R5; @@ -834,4 +839,4 @@ glFBDevMakeCurrent( GLFBDevContextPtr context, return 1; } -#endif +#endif /* USE_GLFBDEV_DRIVER */ |