gfx/angle/angle-fixes.patch

   1 Fixes for angle defects 51 and 52
   2
   3 Index: src/libGLESv2/Texture.cpp
   4 ===================================================================
   5 --- src/libGLESv2/Texture.cpp   (revision 474)
   6 +++ src/libGLESv2/Texture.cpp   (working copy)
   7 @@ -1207,6 +1207,9 @@
   8          mHeight = height << level;
   9          mImageArray[0].format = internalFormat;
  10          mType = type;
  11 +
  12 +        if (mColorbufferProxy.get())
  13 +            mColorbufferProxy->setStorage(new TextureColorbufferProxy(this, GL_TEXTURE_2D));
  14      }
  15
  16      return !textureOkay;
  17 @@ -2081,6 +2084,12 @@
  18          mImageArray[0][0].height = width << level;
  19
  20          mImageArray[0][0].format = internalFormat;
  21 +
  22 +        for (int i = 0; i < 6; i++)
  23 +        {
  24 +            if (mFaceProxies[i].get())
  25 +                mFaceProxies[i]->setStorage(new TextureColorbufferProxy(this, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i));
  26 +        }
  27      }
  28
  29      return !textureOkay;
  30 Index: src/libGLESv2/Renderbuffer.cpp
  31 ===================================================================
  32 --- src/libGLESv2/Renderbuffer.cpp      (revision 474)
  33 +++ src/libGLESv2/Renderbuffer.cpp      (working copy)
  34 @@ -246,12 +246,12 @@
  35      return true;
  36  }
  37
  38 -GLuint Colorbuffer::getRedSize() const
  39 +GLuint Colorbuffer::getRedSize()
  40  {
  41 -    if (mRenderTarget)
  42 +    if (getRenderTarget())
  43      {
  44          D3DSURFACE_DESC description;
  45 -        mRenderTarget->GetDesc(&description);
  46 +        getRenderTarget()->GetDesc(&description);
  47
  48          return es2dx::GetRedSize(description.Format);
  49      }
  50 @@ -259,12 +259,12 @@
  51      return 0;
  52  }
  53
  54 -GLuint Colorbuffer::getGreenSize() const
  55 +GLuint Colorbuffer::getGreenSize()
  56  {
  57 -    if (mRenderTarget)
  58 +    if (getRenderTarget())
  59      {
  60          D3DSURFACE_DESC description;
  61 -        mRenderTarget->GetDesc(&description);
  62 +        getRenderTarget()->GetDesc(&description);
  63
  64          return es2dx::GetGreenSize(description.Format);
  65      }
  66 @@ -272,12 +272,12 @@
  67      return 0;
  68  }
  69
  70 -GLuint Colorbuffer::getBlueSize() const
  71 +GLuint Colorbuffer::getBlueSize()
  72  {
  73 -    if (mRenderTarget)
  74 +    if (getRenderTarget())
  75      {
  76          D3DSURFACE_DESC description;
  77 -        mRenderTarget->GetDesc(&description);
  78 +        getRenderTarget()->GetDesc(&description);
  79
  80          return es2dx::GetBlueSize(description.Format);
  81      }
  82 @@ -285,12 +285,12 @@
  83      return 0;
  84  }
  85
  86 -GLuint Colorbuffer::getAlphaSize() const
  87 +GLuint Colorbuffer::getAlphaSize()
  88  {
  89 -    if (mRenderTarget)
  90 +    if (getRenderTarget())
  91      {
  92          D3DSURFACE_DESC description;
  93 -        mRenderTarget->GetDesc(&description);
  94 +        getRenderTarget()->GetDesc(&description);
  95
  96          return es2dx::GetAlphaSize(description.Format);
  97      }
  98 Index: src/libGLESv2/Renderbuffer.h
  99 ===================================================================
 100 --- src/libGLESv2/Renderbuffer.h        (revision 474)
 101 +++ src/libGLESv2/Renderbuffer.h        (working copy)
 102 @@ -109,10 +109,10 @@
 103
 104      bool isColorbuffer() const;
 105
 106 -    GLuint getRedSize() const;
 107 -    GLuint getGreenSize() const;
 108 -    GLuint getBlueSize() const;
 109 -    GLuint getAlphaSize() const;
 110 +    GLuint getRedSize();
 111 +    GLuint getGreenSize();
 112 +    GLuint getBlueSize();
 113 +    GLuint getAlphaSize();
 114
 115      IDirect3DSurface9 *getRenderTarget();
 116