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

am 29512bbb: am fbd9283c: Merge "GLES2 translator: fix point rendering"

Browse Source 
* commit '29512bbbc099fa2cf38eb2ca031c2763269edb8e':
  GLES2 translator: fix point rendering
This commit is contained in:
David Turner
2011-07-11 15:57:04 -07:00
committed by Android Git Automerger
parent 248ba3e50c 29512bbbc0
commit d538593a21
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
View File

@@ -26,6 +26,7 @@
#include <GLES2/gl2ext.h>
#include <GLcommon/TranslatorIfaces.h>
#include <GLcommon/ThreadInfo.h>
#include <GLcommon/gldefs.h>
#include "GLESv2Context.h"
#include "GLESv2Validate.h"
#include "ShaderParser.h"
@@ -453,7 +454,20 @@ GL_APICALL void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei coun
GLESConversionArrays tmpArrs;
ctx->setupArraysPointers(tmpArrs,first,count,0,NULL,true);
//Enable texture generation for GL_POINTS and gl_PointSize shader variable
//GLES2 assumes this is enabled by default, we need to set this state for GL
if (mode==GL_POINTS) {
ctx->dispatcher().glEnable(GL_POINT_SPRITE);
ctx->dispatcher().glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
}
ctx->dispatcher().glDrawArrays(mode,first,count);
if (mode==GL_POINTS) {
ctx->dispatcher().glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
ctx->dispatcher().glDisable(GL_POINT_SPRITE);
}
}
GL_APICALL void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* elementsIndices){
@@ -469,7 +483,19 @@ GL_APICALL void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum t
GLESConversionArrays tmpArrs;
ctx->setupArraysPointers(tmpArrs,0,count,type,indices,false);
//See glDrawArrays
if (mode==GL_POINTS) {
ctx->dispatcher().glEnable(GL_POINT_SPRITE);
ctx->dispatcher().glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
}
ctx->dispatcher().glDrawElements(mode,count,type,indices);
if (mode==GL_POINTS) {
ctx->dispatcher().glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
ctx->dispatcher().glDisable(GL_POINT_SPRITE);
}
}
GL_APICALL void GL_APIENTRY glEnable(GLenum cap){

2
tools/emulator/opengl/host/libs/Translator/include/GLcommon/gldefs.h
View File

@@ -25,3 +25,5 @@ typedef double GLdouble; /* double precision float */
#define GL_INT 0x1404
#define GL_HALF_FLOAT_NV 0x140B
#define GL_HALF_FLOAT 0x140B
#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
#define GL_POINT_SPRITE 0x8861