piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the public svn_rev_str for the kernel.bin header instead of

Browse Source 
the private SVN_REV_STR which relies on finicky build mechanics.

With SCons, kill the old svnrev.h in Source if still present.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6715 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-01 21:08:30 +00:00
parent 7703018632
commit 6ffdbe8482
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/SConscript
View File

@ -7,6 +7,7 @@ from SconsTests import utils
utils.GenerateRevFile(env['flavor'], Dir('#Source/Core/Common/Src').abspath + utils.GenerateRevFile(env['flavor'], Dir('#Source/Core/Common/Src').abspath +
os.sep + 'svnrev_template.h', 'svnrev.h') os.sep + 'svnrev_template.h', 'svnrev.h')
Execute(Delete(File('#Source/Core/Common/Src/svnrev.h')))
files = [ files = [
"ABI.cpp", "ABI.cpp",

28
Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
View File

@ -20,8 +20,6 @@
#include "OpenCL.h" #include "OpenCL.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "svnrev.h"
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -84,6 +82,8 @@ sDecoderParameter g_DecodeParametersRGBA[] = {
bool g_Inited = false; bool g_Inited = false;
cl_mem g_clsrc, g_cldst; // texture buffer memory objects cl_mem g_clsrc, g_cldst; // texture buffer memory objects
#define HEADER_SIZE 32
void TexDecoder_OpenCL_Initialize() void TexDecoder_OpenCL_Initialize()
{ {
#if defined(HAVE_OPENCL) && HAVE_OPENCL #if defined(HAVE_OPENCL) && HAVE_OPENCL
@ -101,8 +101,10 @@ void TexDecoder_OpenCL_Initialize()
size_t *binary_sizes = NULL; size_t *binary_sizes = NULL;
char **binaries = NULL; char **binaries = NULL;
char filename[1024]; char filename[1024];
char dolphin_rev[HEADER_SIZE];
sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX)); sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX));
snprintf(dolphin_rev, HEADER_SIZE, "%-31s", svn_rev_str);
FILE *input = NULL; FILE *input = NULL;
@ -114,22 +116,19 @@ void TexDecoder_OpenCL_Initialize()
else else
{ {
binary_size = File::GetSize(input); binary_size = File::GetSize(input);
header = new char[10]; header = new char[HEADER_SIZE];
binary = new char[binary_size]; binary = new char[binary_size];
fread(header, sizeof(char), 10, input); fread(header, sizeof(char), HEADER_SIZE, input);
binary_size = fread(binary, sizeof(char), binary_size - 10, input); binary_size = fread(binary, sizeof(char),
binary_size - HEADER_SIZE, input);
fclose(input); fclose(input);
} }
if (binary_size > 0) if (binary_size > 0)
{ {
if (binary_size > 10) if (binary_size > HEADER_SIZE)
{ {
header[9] = '\0'; if (strncmp(header, dolphin_rev, HEADER_SIZE) == 0)
std::string current_rev = SVN_REV_STR;
std::string file_rev = header;
if (!current_rev.compare(0, 9, file_rev))
{ {
g_program = clCreateProgramWithBinary(OpenCL::GetContext(), 1, &OpenCL::device_id, &binary_size, (const unsigned char**)&binary, NULL, &err); g_program = clCreateProgramWithBinary(OpenCL::GetContext(), 1, &OpenCL::device_id, &binary_size, (const unsigned char**)&binary, NULL, &err);
if (err != CL_SUCCESS) if (err != CL_SUCCESS)
@ -188,7 +187,7 @@ void TexDecoder_OpenCL_Initialize()
{ {
if( binary_sizes[i] != 0 ) if( binary_sizes[i] != 0 )
{ {
binaries[i] = (char *)malloc(sizeof(char)*binary_sizes[i] + 10); binaries[i] = (char *)malloc(HEADER_SIZE + binary_sizes[i]);
} }
else else
{ {
@ -204,10 +203,9 @@ void TexDecoder_OpenCL_Initialize()
if (!err) if (!err)
{ {
sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX)); sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX));
const char *current_rev = SVN_REV_STR + '\0';
FILE *output = NULL; FILE *output = NULL;
output = fopen(filename, "wb"); output = fopen(filename, "wb");
if (output == NULL) if (output == NULL)
{ {
binary_size = 0; binary_size = 0;
@ -215,7 +213,7 @@ void TexDecoder_OpenCL_Initialize()
else else
{ {
// Supporting one OpenCL device for now // Supporting one OpenCL device for now
fwrite(current_rev, sizeof(char), 10, output); fwrite(dolphin_rev, sizeof(char), HEADER_SIZE, output);
fwrite(binaries[0], sizeof(char), binary_sizes[0], output); fwrite(binaries[0], sizeof(char), binary_sizes[0], output);
fclose(output); fclose(output);
} }