← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring

« back to all changes in this revision

Viewing changes to src/mesa/main/texstorage.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-01-22 11:54:09 UTC
  • mfrom: (1.7.13)
  • Revision ID: package-import@ubuntu.com-20130122115409-5e9xii2ee1whab3e
Tags: 9.0.2-0ubuntu1
* New upstream release.
* Decrease size of mesa's libgl1-mesa-dri again
  - re-enable 117-static-gallium.patch
  - add 118-dricore-gallium.patch to link against libdricore again

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/texstorage.c
244
244
                        GLsizei width, GLsizei height, GLsizei depth)
245
245
{
246
246
   struct gl_texture_object *texObj;
247
 
   GLuint maxDim;
248
247
   GLboolean legalFormat;
249
248
 
250
249
   /* check internal format - note that only sized formats are allowed */
324
323
   }
325
324
 
326
325
   /* check levels against width/height/depth */
327
 
   maxDim = MAX3(width, height, depth);
328
 
   if (levels > _mesa_logbase2(maxDim) + 1) {
 
326
   if (levels > _mesa_get_tex_max_num_levels(target, width, height, depth)) {
329
327
      _mesa_error(ctx, GL_INVALID_OPERATION,
330
328
                  "glTexStorage%uD(too many levels for max texture dimension)",
331
329
                  dims);