Browse Source

mesa: use util_hash_crc32 instead of _mesa_str_checksum

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
tags/17.0-branchpoint
Marek Olšák 8 years ago
parent
commit
6dfdf52b6a
3 changed files with 2 additions and 26 deletions
  1. 0
    22
      src/mesa/main/imports.c
  2. 0
    3
      src/mesa/main/imports.h
  3. 2
    1
      src/mesa/main/shaderapi.c

+ 0
- 22
src/mesa/main/imports.c View File

@@ -252,28 +252,6 @@ _mesa_bitcount_64(uint64_t n)
/*@}*/


/**********************************************************************/
/** \name String */
/*@{*/


/** Compute simple checksum/hash for a string */
unsigned int
_mesa_str_checksum(const char *str)
{
/* This could probably be much better */
unsigned int sum, i;
const char *c;
sum = i = 1;
for (c = str; *c; c++, i++)
sum += *c * (i % 100);
return sum + i;
}


/*@}*/


/** Needed due to #ifdef's, above. */
int
_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list args)

+ 0
- 3
src/mesa/main/imports.h View File

@@ -346,9 +346,6 @@ _mesa_half_is_negative(GLhalfARB h)
return h & 0x8000;
}

extern unsigned int
_mesa_str_checksum(const char *str);

extern int
_mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);


+ 2
- 1
src/mesa/main/shaderapi.c View File

@@ -59,6 +59,7 @@
#include "util/ralloc.h"
#include "util/hash_table.h"
#include "util/mesa-sha1.h"
#include "util/crc32.h"

/**
* Return mask of GLSL_x flags by examining the MESA_GLSL env var.
@@ -992,7 +993,7 @@ shader_source(struct gl_shader *sh, const GLchar *source)
free((void *)sh->Source);
sh->Source = source;
#ifdef DEBUG
sh->SourceChecksum = _mesa_str_checksum(sh->Source);
sh->SourceChecksum = util_hash_crc32(sh->Source, strlen(sh->Source));
#endif
}


Loading…
Cancel
Save