OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: update oudated members for debug and check

Browse Source 
Signed-off-by: Chen Li <chenli@uniontech.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7896>
This commit is contained in:
chenli
2020-12-03 19:49:56 +08:00
committed by Marge Bot
parent 54cb05b46c
commit df29245720
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/bufferobj.c
View File

@@ -2882,8 +2882,8 @@ validate_and_unmap_buffer(struct gl_context *ctx,
} }
#ifdef BOUNDS_CHECK #ifdef BOUNDS_CHECK
if (bufObj->Access != GL_READ_ONLY_ARB) { if (bufObj->Mappings[MAP_USER].AccessFlags != GL_READ_ONLY_ARB) {
GLubyte *buf = (GLubyte *) bufObj->Pointer; GLubyte *buf = (GLubyte *) bufObj->Mappings[MAP_USER].Pointer;
GLuint i; GLuint i;
/* check that last 100 bytes are still = magic value */ /* check that last 100 bytes are still = magic value */
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
@@ -2898,9 +2898,9 @@ validate_and_unmap_buffer(struct gl_context *ctx,
#endif #endif
#ifdef VBO_DEBUG #ifdef VBO_DEBUG
if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) { if (bufObj->Mappings[MAP_USER].AccessFlags & GL_MAP_WRITE_BIT) {
GLuint i, unchanged = 0; GLuint i, unchanged = 0;
GLubyte *b = (GLubyte *) bufObj->Pointer; GLubyte *b = (GLubyte *) bufObj->Mappings[MAP_USER].Pointer;
GLint pos = -1; GLint pos = -1;
/* check which bytes changed */ /* check which bytes changed */
for (i = 0; i < bufObj->Size - 1; i++) { for (i = 0; i < bufObj->Size - 1; i++) {
@@ -3583,7 +3583,7 @@ map_buffer_range(struct gl_context *ctx, struct gl_buffer_object *bufObj,
/* Access must be write only */ /* Access must be write only */
if ((access & GL_MAP_WRITE_BIT) && (!(access & ~GL_MAP_WRITE_BIT))) { if ((access & GL_MAP_WRITE_BIT) && (!(access & ~GL_MAP_WRITE_BIT))) {
GLuint i; GLuint i;
GLubyte *b = (GLubyte *) bufObj->Pointer; GLubyte *b = (GLubyte *) bufObj->Mappings[MAP_USER].Pointer;
for (i = 0; i < bufObj->Size; i++) for (i = 0; i < bufObj->Size; i++)
b[i] = i & 0xff; b[i] = i & 0xff;
} }
@@ -3592,7 +3592,7 @@ map_buffer_range(struct gl_context *ctx, struct gl_buffer_object *bufObj,
#ifdef BOUNDS_CHECK #ifdef BOUNDS_CHECK
if (strstr(func, "Range") == NULL) { /* If not MapRange */ if (strstr(func, "Range") == NULL) { /* If not MapRange */
GLubyte *buf = (GLubyte *) bufObj->Pointer; GLubyte *buf = (GLubyte *) bufObj->Mappings[MAP_USER].Pointer;
GLuint i; GLuint i;
/* buffer is 100 bytes larger than requested, fill with magic value */ /* buffer is 100 bytes larger than requested, fill with magic value */
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {