summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-10-23 08:30:36 -0600
committerBrian <[email protected]>2007-10-23 08:30:36 -0600
commit5c79c088cd0a2c512891b87b67a3c4f810595658 (patch)
tree013acc615b16a97e98d7473f6e117151cef6aba8 /src/mesa/state_tracker
parent588c91eb0a93bdb1ae2819db63b081c9d78833d1 (diff)
Don't pad renderbuffers to multiple of two pixels anymore.
This was only needed to avoid out-of-bounds memory accesses with the 2x2 quad_read/write() functions which no longer exist.
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_cb_fbo.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 64a64fd6b9c..94e286feabe 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -64,7 +64,6 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
const struct pipe_format_info *info = st_get_format_info(pipeFormat);
GLuint cpp;
GLbitfield flags = PIPE_SURFACE_FLAG_RENDER; /* want to render to surface */
- GLuint width2, height2;
assert(info);
if (!info)
@@ -99,11 +98,7 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
pipe->region_release(pipe, &strb->surface->region);
}
- /* Softpipe operates on quads, so pad dimensions to multiples of 2 */
- width2 = (width + 1) & ~1;
- height2 = (height + 1) & ~1;
-
- strb->surface->region = pipe->region_alloc(pipe, cpp, width2, height2, flags);
+ strb->surface->region = pipe->region_alloc(pipe, cpp, width, height, flags);
if (!strb->surface->region)
return GL_FALSE; /* out of memory, try s/w buffer? */