LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am ae707198: am 275e99fd: Merge "opengles emulator: remove compilation warning."

Browse Source 
* commit 'ae70719852919ca3a7ed614481380e2ad14d97a3':
  opengles emulator: remove compilation warning.
This commit is contained in:
David Turner
2011-08-10 01:21:25 -07:00
committed by Android Git Automerger
parent 7cd5d7bfdc ae70719852
commit 1a50f15fe9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp
View File

@@ -38,7 +38,7 @@ GLDecoder::~GLDecoder()
int GLDecoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData) int GLDecoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData)
{ {
if (getProcFunc == NULL) { if (getProcFunc == NULL) {
char *libname = GLES_LIBNAME; const char *libname = GLES_LIBNAME;
if (getenv(GLES_LIBNAME_VAR) != NULL) { if (getenv(GLES_LIBNAME_VAR) != NULL) {
libname = getenv(GLES_LIBNAME_VAR); libname = getenv(GLES_LIBNAME_VAR);
} }

6
tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp
View File

@@ -428,7 +428,8 @@ bool checkWindowPixelFormatMatch(EGLNativeInternalDisplayType dpy,EGLNativeWindo
*width = r.right - r.left; *width = r.right - r.left;
*height = r.bottom - r.top; *height = r.bottom - r.top;
HDC dc = GetDC(win); HDC dc = GetDC(win);
bool ret = SetPixelFormat(dc,cfg->nativeId(),&cfg->nativeConfig()); EGLNativePixelFormatType nativeConfig = cfg->nativeConfig();
bool ret = SetPixelFormat(dc,cfg->nativeId(),&nativeConfig);
DeleteDC(dc); DeleteDC(dc);
return ret; return ret;
} }
@@ -495,7 +496,8 @@ EGLNativeContextType createContext(EGLNativeInternalDisplayType display,EglConfi
HDC dpy = getDummyDC(display,cfg->nativeId()); HDC dpy = getDummyDC(display,cfg->nativeId());
if(!display->isPixelFormatSet(cfg->nativeId())){ if(!display->isPixelFormatSet(cfg->nativeId())){
if(!SetPixelFormat(dpy,cfg->nativeId(),&cfg->nativeConfig())){ EGLNativePixelFormatType nativeConfig = cfg->nativeConfig();
if(!SetPixelFormat(dpy,cfg->nativeId(),&nativeConfig)){
return NULL; return NULL;
} }
display->pixelFormatWasSet(cfg->nativeId()); display->pixelFormatWasSet(cfg->nativeId());

2
tools/emulator/opengl/host/tools/emugen/ApiGen.cpp
View File

@@ -542,7 +542,7 @@ int ApiGen::genDecoderHeader(const std::string &filename)
classname.c_str(), m_basename.c_str(), sideString(SERVER_SIDE)); classname.c_str(), m_basename.c_str(), sideString(SERVER_SIDE));
fprintf(fp, "\tsize_t decode(void *buf, size_t bufsize, IOStream *stream);\n"); fprintf(fp, "\tsize_t decode(void *buf, size_t bufsize, IOStream *stream);\n");
fprintf(fp, "\n};\n\n"); fprintf(fp, "\n};\n\n");
fprintf(fp, "#endif"); fprintf(fp, "#endif\n");
fclose(fp); fclose(fp);
return 0; return 0;