- Timestamp:
- May 23, 2013 2:04:52 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_teximage.c
r25154 r46235 246 246 default: 247 247 /* fall-through */ 248 248 ; 249 249 } 250 250 … … 309 309 #endif 310 310 311 crWarning("unexpected texTarget 0x%x", texTarget); 311 312 *obj = NULL; 312 313 *img = NULL; … … 972 973 } 973 974 975 #ifdef DEBUG_misha 976 CRASSERT(tl->bytes); 977 CRASSERT(tl->height); 978 CRASSERT(tl->width); 979 CRASSERT(tl->depth); 980 #endif 981 974 982 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE 975 983 xoffset += tl->border; … … 1024 1032 CRASSERT(tobj); 1025 1033 CRASSERT(tl); 1034 1035 #ifdef DEBUG_misha 1036 CRASSERT(tl->bytes); 1037 CRASSERT(tl->height); 1038 CRASSERT(tl->width); 1039 CRASSERT(tl->depth); 1040 #endif 1026 1041 1027 1042 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE … … 1110 1125 } 1111 1126 1127 #ifdef DEBUG_misha 1128 CRASSERT(target == GL_TEXTURE_3D); 1129 CRASSERT(tl->bytes); 1130 CRASSERT(tl->height); 1131 CRASSERT(tl->width); 1132 CRASSERT(tl->depth); 1133 #endif 1134 1112 1135 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE 1113 1136 xoffset += tl->border; … … 1417 1440 } 1418 1441 1442 #ifdef DEBUG_misha 1443 CRASSERT(target == GL_TEXTURE_1D); 1444 CRASSERT(tl->bytes); 1445 CRASSERT(tl->height); 1446 CRASSERT(tl->width); 1447 CRASSERT(tl->depth); 1448 #endif 1449 1419 1450 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE 1420 1451 xoffset += tl->border; … … 1457 1488 CRTextureBits *tb = &(sb->texture); 1458 1489 CRTextureUnit *unit = t->unit + t->curTextureUnit; 1459 CRTextureObj *tobj = unit->currentTexture 1D;1490 CRTextureObj *tobj = unit->currentTexture2D; 1460 1491 CRTextureLevel *tl = tobj->level[0] + level; 1461 1492 1462 1493 FLUSH(); 1494 1495 #ifdef DEBUG_misha 1496 CRASSERT(target == GL_TEXTURE_2D); 1497 CRASSERT(tl->bytes); 1498 CRASSERT(tl->height); 1499 CRASSERT(tl->width); 1500 CRASSERT(tl->depth); 1501 #endif 1463 1502 1464 1503 if (ErrorCheckTexSubImage(2, target, level, xoffset, yoffset, 0, … … 1511 1550 CRTextureBits *tb = &(sb->texture); 1512 1551 CRTextureUnit *unit = t->unit + t->curTextureUnit; 1513 CRTextureObj *tobj = unit->currentTexture 1D;1552 CRTextureObj *tobj = unit->currentTexture3D; 1514 1553 CRTextureLevel *tl = tobj->level[0] + level; 1515 1554 1516 1555 FLUSH(); 1556 1557 #ifdef DEBUG_misha 1558 CRASSERT(target == GL_TEXTURE_3D); 1559 CRASSERT(tl->bytes); 1560 CRASSERT(tl->height); 1561 CRASSERT(tl->width); 1562 CRASSERT(tl->depth); 1563 #endif 1517 1564 1518 1565 if (ErrorCheckTexSubImage(3, target, level, xoffset, yoffset, zoffset, … … 1581 1628 } 1582 1629 1630 #ifdef DEBUG_misha 1631 CRASSERT(tl->bytes); 1632 CRASSERT(tl->height); 1633 CRASSERT(tl->width); 1634 CRASSERT(tl->depth); 1635 #endif 1636 1583 1637 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE 1584 1638 crMemcpy(img, tl->img, tl->bytes); … … 1616 1670 return; 1617 1671 } 1672 1673 #ifdef DEBUG_misha 1674 CRASSERT(tl->bytes); 1675 CRASSERT(tl->height); 1676 CRASSERT(tl->width); 1677 CRASSERT(tl->depth); 1678 #endif 1618 1679 1619 1680 switch (format)
Note:
See TracChangeset
for help on using the changeset viewer.
