|
Line
Link Here
|
| 0 |
-- src/mesa/drivers/dri/tdfx/tdfx_tex.c 2006/04/02 23:15:35 1.32 |
0 |
++ src/mesa/drivers/dri/tdfx/tdfx_tex.c 2006/04/03 21:28:07 1.33 |
|
Lines 1357-1366
Link Here
|
| 1357 |
1, |
1357 |
1, |
| 1358 |
internalFormat); |
1358 |
internalFormat); |
| 1359 |
dstRowStride = _mesa_compressed_row_stride(internalFormat, mml->width); |
1359 |
dstRowStride = _mesa_compressed_row_stride(internalFormat, mml->width); |
| 1360 |
texImage->Data = _mesa_malloc(texImage->CompressedSize); |
1360 |
texImage->Data = _mesa_alloc_texmemory(texImage->CompressedSize); |
| 1361 |
} else { |
1361 |
} else { |
| 1362 |
dstRowStride = mml->width * texelBytes; |
1362 |
dstRowStride = mml->width * texelBytes; |
| 1363 |
texImage->Data = _mesa_malloc(mml->width * mml->height * texelBytes); |
1363 |
texImage->Data = _mesa_alloc_texmemory(mml->width * mml->height * |
|
|
1364 |
texelBytes); |
| 1364 |
} |
1365 |
} |
| 1365 |
if (!texImage->Data) { |
1366 |
if (!texImage->Data) { |
| 1366 |
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D"); |
1367 |
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D"); |
|
Lines 1663-1669
Link Here
|
| 1663 |
mml->height, |
1664 |
mml->height, |
| 1664 |
1, |
1665 |
1, |
| 1665 |
internalFormat); |
1666 |
internalFormat); |
| 1666 |
texImage->Data = _mesa_malloc(texImage->CompressedSize); |
1667 |
texImage->Data = _mesa_alloc_texmemory(texImage->CompressedSize); |
| 1667 |
if (!texImage->Data) { |
1668 |
if (!texImage->Data) { |
| 1668 |
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D"); |
1669 |
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D"); |
| 1669 |
return; |
1670 |
return; |
