[Mesa-dev] [PATCH 1/2] dri: Remove driver date from renderer string
Ian Romanick
idr at freedesktop.org
Thu Mar 31 13:30:35 PDT 2011
From: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/dri/common/utils.c | 5 ++---
src/mesa/drivers/dri/common/utils.h | 2 +-
src/mesa/drivers/dri/i810/i810context.c | 4 +---
src/mesa/drivers/dri/intel/intel_context.c | 6 +-----
src/mesa/drivers/dri/mach64/mach64_dd.c | 5 +----
src/mesa/drivers/dri/mga/mgadd.c | 4 ----
src/mesa/drivers/dri/nouveau/nouveau_driver.c | 2 +-
src/mesa/drivers/dri/nouveau/nouveau_driver.h | 1 -
src/mesa/drivers/dri/r128/r128_dd.c | 6 +-----
src/mesa/drivers/dri/r200/r200_context.c | 5 +----
.../drivers/dri/radeon/radeon_common_context.c | 5 +----
src/mesa/drivers/dri/radeon/radeon_context.c | 2 --
src/mesa/drivers/dri/savage/savagedd.c | 4 +---
src/mesa/drivers/dri/sis/sis_dd.c | 4 +---
src/mesa/drivers/dri/tdfx/tdfx_dd.c | 5 +----
src/mesa/drivers/dri/unichrome/via_context.c | 4 +---
16 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 083edfa..d828183 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -96,7 +96,6 @@ driParseDebugString( const char * debug,
*
* \param buffer Buffer to hold the \c GL_RENDERER string.
* \param hardware_name Name of the hardware.
- * \param driver_date Driver date.
* \param agp_mode AGP mode (speed).
*
* \returns
@@ -105,12 +104,12 @@ driParseDebugString( const char * debug,
*/
unsigned
driGetRendererString( char * buffer, const char * hardware_name,
- const char * driver_date, GLuint agp_mode )
+ GLuint agp_mode )
{
unsigned offset;
char *cpu;
- offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );
+ offset = sprintf( buffer, "Mesa DRI %s", hardware_name );
/* Append any AGP-specific information.
*/
diff --git a/src/mesa/drivers/dri/common/utils.h b/src/mesa/drivers/dri/common/utils.h
index 6349fb4..a1c9ea6 100644
--- a/src/mesa/drivers/dri/common/utils.h
+++ b/src/mesa/drivers/dri/common/utils.h
@@ -76,7 +76,7 @@ extern unsigned driParseDebugString( const char * debug,
const struct dri_debug_control * control );
extern unsigned driGetRendererString( char * buffer,
- const char * hardware_name, const char * driver_date, GLuint agp_mode );
+ const char * hardware_name, GLuint agp_mode );
extern void driInitExtensions( struct gl_context * ctx,
const struct dri_extension * card_extensions, GLboolean enable_imaging );
diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 90dbb6b..604b1e3 100644
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -67,8 +67,6 @@ int I810_DEBUG = (0);
PUBLIC const char __driConfigOptions[] = { 0 };
const GLuint __driNConfigOptions = 0;
-#define DRIVER_DATE "20050821"
-
static const GLubyte *i810GetString( struct gl_context *ctx, GLenum name )
{
static char buffer[128];
@@ -88,7 +86,7 @@ static const GLubyte *i810GetString( struct gl_context *ctx, GLenum name )
default: chipset = "Unknown i810-class Chipset"; break;
}
- (void) driGetRendererString( buffer, chipset, DRIVER_DATE, 0 );
+ (void) driGetRendererString( buffer, chipset, 0 );
return (GLubyte *) buffer;
}
default:
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index c2e2a98..2855c21 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -62,10 +62,6 @@ int INTEL_DEBUG = (0);
#endif
-#define DRIVER_DATE "20100330 DEVELOPMENT"
-#define DRIVER_DATE_GEM "GEM " DRIVER_DATE
-
-
static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
{
@@ -182,7 +178,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
break;
}
- (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0);
+ (void) driGetRendererString(buffer, chipset, 0);
return (GLubyte *) buffer;
default:
diff --git a/src/mesa/drivers/dri/mach64/mach64_dd.c b/src/mesa/drivers/dri/mach64/mach64_dd.c
index 9cb2c10..2b557a7 100644
--- a/src/mesa/drivers/dri/mach64/mach64_dd.c
+++ b/src/mesa/drivers/dri/mach64/mach64_dd.c
@@ -37,8 +37,6 @@
#include "utils.h"
-#define DRIVER_DATE "20051019"
-
/* Return the current color buffer size.
*/
static void mach64DDGetBufferSize( struct gl_framebuffer *buffer,
@@ -70,8 +68,7 @@ static const GLubyte *mach64DDGetString( struct gl_context *ctx, GLenum name )
case GL_RENDERER:
- offset = driGetRendererString( buffer, card_name, DRIVER_DATE,
- agp_mode );
+ offset = driGetRendererString( buffer, card_name, agp_mode );
return (GLubyte *)buffer;
default:
diff --git a/src/mesa/drivers/dri/mga/mgadd.c b/src/mesa/drivers/dri/mga/mgadd.c
index 1b39813..2e3e9f2 100644
--- a/src/mesa/drivers/dri/mga/mgadd.c
+++ b/src/mesa/drivers/dri/mga/mgadd.c
@@ -35,9 +35,6 @@
#include "mga_xmesa.h"
#include "utils.h"
-#define DRIVER_DATE "20071017"
-
-
/***************************************
* Mesa's Driver Functions
***************************************/
@@ -57,7 +54,6 @@ static const GLubyte *mgaGetString( struct gl_context *ctx, GLenum name )
offset = driGetRendererString( buffer,
MGA_IS_G400(mmesa) ? "G400" :
MGA_IS_G200(mmesa) ? "G200" : "MGA",
- DRIVER_DATE,
mmesa->mgaScreen->agpMode );
return (GLubyte *)buffer;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
index 45630be..8b6aa82 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
@@ -45,7 +45,7 @@ nouveau_get_string(struct gl_context *ctx, GLenum name)
case GL_RENDERER:
sprintf(hardware_name, "nv%02X", context_chipset(ctx));
- driGetRendererString(buffer, hardware_name, DRIVER_DATE, 0);
+ driGetRendererString(buffer, hardware_name, 0);
return (GLubyte *)buffer;
default:
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 158aec8..0018eec 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -48,7 +48,6 @@
#include "nouveau_surface.h"
#include "nv04_pushbuf.h"
-#define DRIVER_DATE "20091015"
#define DRIVER_AUTHOR "Nouveau"
struct nouveau_driver {
diff --git a/src/mesa/drivers/dri/r128/r128_dd.c b/src/mesa/drivers/dri/r128/r128_dd.c
index 0b7005e..cfe2387 100644
--- a/src/mesa/drivers/dri/r128/r128_dd.c
+++ b/src/mesa/drivers/dri/r128/r128_dd.c
@@ -40,9 +40,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "utils.h"
-#define DRIVER_DATE "20051027"
-
-
/* Return the width and height of the current color buffer.
*/
static void r128GetBufferSize( struct gl_framebuffer *buffer,
@@ -82,8 +79,7 @@ static const GLubyte *r128GetString( struct gl_context *ctx, GLenum name )
card_name = "Rage 128 Mobility";
}
- offset = driGetRendererString( buffer, card_name, DRIVER_DATE,
- agp_mode );
+ offset = driGetRendererString( buffer, card_name, agp_mode );
return (GLubyte *)buffer;
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 9c045b7..4773263 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -76,8 +76,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/remap_helper.h"
-#define DRIVER_DATE "20060602"
-
#include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */
@@ -96,8 +94,7 @@ static const GLubyte *r200GetString( struct gl_context *ctx, GLenum name )
return (GLubyte *)"Tungsten Graphics, Inc.";
case GL_RENDERER:
- offset = driGetRendererString( buffer, "R200", DRIVER_DATE,
- agp_mode );
+ offset = driGetRendererString( buffer, "R200", agp_mode );
sprintf( & buffer[ offset ], " %sTCL",
!(rmesa->radeon.TclFallback & R200_TCL_FALLBACK_TCL_DISABLE)
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 405aecb..5d7b397 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -47,8 +47,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast_setup/swrast_setup.h"
#include "tnl/tnl.h"
-#define DRIVER_DATE "20090101"
-
#ifndef RADEON_DEBUG
int RADEON_DEBUG = (0);
#endif
@@ -146,8 +144,7 @@ static const GLubyte *radeonGetString(struct gl_context * ctx, GLenum name)
get_chip_family_name(radeon->radeonScreen->chip_family),
radeon->radeonScreen->device_id);
- offset = driGetRendererString(buffer, hardwarename, DRIVER_DATE,
- agp_mode);
+ offset = driGetRendererString(buffer, hardwarename, agp_mode);
if (IS_R600_CLASS(radeon->radeonScreen)) {
sprintf(&buffer[offset], " TCL");
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 154a881..4d41e99 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -70,8 +70,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define need_GL_OES_EGL_image
#include "main/remap_helper.h"
-#define DRIVER_DATE "20061018"
-
#include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */
diff --git a/src/mesa/drivers/dri/savage/savagedd.c b/src/mesa/drivers/dri/savage/savagedd.c
index 3f8d7aa..c7f58835 100644
--- a/src/mesa/drivers/dri/savage/savagedd.c
+++ b/src/mesa/drivers/dri/savage/savagedd.c
@@ -38,8 +38,6 @@
#include "utils.h"
-#define DRIVER_DATE "20061110"
-
/***************************************
* Mesa's Driver Functions
***************************************/
@@ -71,7 +69,7 @@ static const GLubyte *savageDDGetString( struct gl_context *ctx, GLenum name )
case GL_VENDOR:
return (GLubyte *)"S3 Graphics Inc.";
case GL_RENDERER:
- offset = driGetRendererString( buffer, cardNames[chipset], DRIVER_DATE,
+ offset = driGetRendererString( buffer, cardNames[chipset],
screen->agpMode );
return (GLubyte *)buffer;
default:
diff --git a/src/mesa/drivers/dri/sis/sis_dd.c b/src/mesa/drivers/dri/sis/sis_dd.c
index 90e894b..bba516f 100644
--- a/src/mesa/drivers/dri/sis/sis_dd.c
+++ b/src/mesa/drivers/dri/sis/sis_dd.c
@@ -45,8 +45,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "utils.h"
-#define DRIVER_DATE "20060710"
-
/* Return the width and height of the given buffer.
*/
static void
@@ -78,7 +76,7 @@ sisGetString( struct gl_context *ctx, GLenum name )
return (GLubyte *)"Eric Anholt";
case GL_RENDERER:
- offset = driGetRendererString( buffer, "SiS", DRIVER_DATE, agp_mode );
+ offset = driGetRendererString( buffer, "SiS", agp_mode );
return (GLubyte *)buffer;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_dd.c b/src/mesa/drivers/dri/tdfx/tdfx_dd.c
index d60931a..e981f9a 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_dd.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_dd.c
@@ -41,9 +41,6 @@
#include "main/context.h"
-#define DRIVER_DATE "20061113"
-
-
/* These are used in calls to FX_grColorMaskv() */
const GLboolean false4[4] = { GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE };
const GLboolean true4[4] = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE };
@@ -91,7 +88,7 @@ static const GLubyte *tdfxDDGetString( struct gl_context *ctx, GLenum name )
}
}
- (void) driGetRendererString(buffer, hardware, DRIVER_DATE, 0);
+ (void) driGetRendererString(buffer, hardware, 0);
return (const GLubyte *) buffer;
}
case GL_VENDOR:
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index 77d7116..89c2a12 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -65,8 +65,6 @@
#define need_GL_EXT_secondary_color
#include "main/remap_helper.h"
-#define DRIVER_DATE "20060710"
-
#include "vblank.h"
#include "utils.h"
@@ -100,7 +98,7 @@ static const GLubyte *viaGetString(struct gl_context *ctx, GLenum name)
offset = driGetRendererString( buffer,
chipset_names[(id > VIA_PM800) ? 0 : id],
- DRIVER_DATE, 0 );
+ 0 );
return (GLubyte *)buffer;
}
--
1.7.4
More information about the mesa-dev
mailing list