projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: Redefine the max texture 2d cap from _LEVELS to _SIZE.
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_drawpixels.c
diff --git
a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6f6b42596e6f3fe51855f914a3395bc70bb95365..59868d3ff1debd70043830bc1a918924264fc7c1 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/
src/mesa/state_tracker/st_cb_drawpixels.c
@@
-758,8
+758,8
@@
draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
/* XXX if DrawPixels image is larger than max texture size, break
* it up into chunks.
*/
/* XXX if DrawPixels image is larger than max texture size, break
* it up into chunks.
*/
- maxSize =
1 << (
pipe->screen->get_param(pipe->screen,
-
PIPE_CAP_MAX_TEXTURE_2D_LEVELS) - 1
);
+ maxSize = pipe->screen->get_param(pipe->screen,
+
PIPE_CAP_MAX_TEXTURE_2D_SIZE
);
assert(width <= maxSize);
assert(height <= maxSize);
assert(width <= maxSize);
assert(height <= maxSize);
@@
-1181,9
+1181,8
@@
static void
clamp_size(struct pipe_context *pipe, GLsizei *width, GLsizei *height,
struct gl_pixelstore_attrib *unpack)
{
clamp_size(struct pipe_context *pipe, GLsizei *width, GLsizei *height,
struct gl_pixelstore_attrib *unpack)
{
- const int maxSize =
- 1 << (pipe->screen->get_param(pipe->screen,
- PIPE_CAP_MAX_TEXTURE_2D_LEVELS) - 1);
+ const int maxSize = pipe->screen->get_param(pipe->screen,
+ PIPE_CAP_MAX_TEXTURE_2D_SIZE);
if (*width > maxSize) {
if (unpack->RowLength == 0)
if (*width > maxSize) {
if (unpack->RowLength == 0)