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

swrast: use gl_renderbuffer::StrideInBytes in depth/stencil code

Browse Source
This commit is contained in:
Brian Paul
2012-01-16 10:55:32 -07:00
parent 7d1ddec921
commit b766d4bb43
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/swrast/s_depth.c
View File

@@ -217,7 +217,7 @@ get_z32_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLuint i; GLuint i;
if (rb->Format == MESA_FORMAT_Z32) { if (rb->Format == MESA_FORMAT_Z32) {
const GLint rowStride = rb->RowStride * 4; const GLint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
zbuffer[i] = *((GLuint *) (map + y[i] * rowStride + x[i] * 4)); zbuffer[i] = *((GLuint *) (map + y[i] * rowStride + x[i] * 4));
@@ -226,7 +226,7 @@ get_z32_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
} }
else { else {
const GLint bpp = _mesa_get_format_bytes(rb->Format); const GLint bpp = _mesa_get_format_bytes(rb->Format);
const GLint rowStride = rb->RowStride * bpp; const GLint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
const GLubyte *src = map + y[i] * rowStride+ x[i] * bpp; const GLubyte *src = map + y[i] * rowStride+ x[i] * bpp;
@@ -251,7 +251,7 @@ put_z32_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLuint i; GLuint i;
if (rb->Format == MESA_FORMAT_Z32) { if (rb->Format == MESA_FORMAT_Z32) {
const GLuint rowStride = rb->RowStride * 4; const GLuint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (mask[i] && x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (mask[i] && x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
GLuint *dst = (GLuint *) (map + y[i] * rowStride + x[i] * 4); GLuint *dst = (GLuint *) (map + y[i] * rowStride + x[i] * 4);
@@ -262,7 +262,7 @@ put_z32_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
else { else {
gl_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format); gl_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format);
const GLint bpp = _mesa_get_format_bytes(rb->Format); const GLint bpp = _mesa_get_format_bytes(rb->Format);
const GLint rowStride = rb->RowStride * bpp; const GLint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (mask[i] && x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (mask[i] && x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
void *dst = map + y[i] * rowStride + x[i] * bpp; void *dst = map + y[i] * rowStride + x[i] * bpp;

4
src/mesa/swrast/s_stencil.c
View File

@@ -297,7 +297,7 @@ get_s8_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLuint i; GLuint i;
if (rb->Format == MESA_FORMAT_S8) { if (rb->Format == MESA_FORMAT_S8) {
const GLint rowStride = rb->RowStride; const GLint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
stencil[i] = *(map + y[i] * rowStride + x[i]); stencil[i] = *(map + y[i] * rowStride + x[i]);
@@ -306,7 +306,7 @@ get_s8_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
} }
else { else {
const GLint bpp = _mesa_get_format_bytes(rb->Format); const GLint bpp = _mesa_get_format_bytes(rb->Format);
const GLint rowStride = rb->RowStride * bpp; const GLint rowStride = rb->RowStrideBytes;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
const GLubyte *src = map + y[i] * rowStride + x[i] * bpp; const GLubyte *src = map + y[i] * rowStride + x[i] * bpp;