| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 3596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3607 case GL_FLOAT_MAT4x2: | 3607 case GL_FLOAT_MAT4x2: |
| 3608 baseType = GL_FLOAT; | 3608 baseType = GL_FLOAT; |
| 3609 length = 8; | 3609 length = 8; |
| 3610 break; | 3610 break; |
| 3611 case GL_FLOAT_MAT4x3: | 3611 case GL_FLOAT_MAT4x3: |
| 3612 baseType = GL_FLOAT; | 3612 baseType = GL_FLOAT; |
| 3613 length = 12; | 3613 length = 12; |
| 3614 break; | 3614 break; |
| 3615 case GL_SAMPLER_3D: | 3615 case GL_SAMPLER_3D: |
| 3616 case GL_SAMPLER_2D_ARRAY: | 3616 case GL_SAMPLER_2D_ARRAY: |
| 3617 case GL_SAMPLER_2D_SHADOW: |
| 3618 case GL_SAMPLER_CUBE_SHADOW: |
| 3619 case GL_SAMPLER_2D_ARRAY_SHADOW: |
| 3620 case GL_INT_SAMPLER_2D: |
| 3621 case GL_INT_SAMPLER_CUBE: |
| 3622 case GL_INT_SAMPLER_3D: |
| 3623 case GL_INT_SAMPLER_2D_ARRAY: |
| 3624 case GL_UNSIGNED_INT_SAMPLER_2D: |
| 3625 case GL_UNSIGNED_INT_SAMPLER_CUBE: |
| 3626 case GL_UNSIGNED_INT_SAMPLER_3D: |
| 3627 case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: |
| 3617 baseType = GL_INT; | 3628 baseType = GL_INT; |
| 3618 length = 1; | 3629 length = 1; |
| 3619 break; | 3630 break; |
| 3620 default: | 3631 default: |
| 3621 // Can't handle this type | 3632 // Can't handle this type |
| 3622 synthesizeGLError(GL_INVALID_VALUE, "getUniform", | 3633 synthesizeGLError(GL_INVALID_VALUE, "getUniform", |
| 3623 "unhandled type"); | 3634 "unhandled type"); |
| 3624 return ScriptValue::createNull(scriptState); | 3635 return ScriptValue::createNull(scriptState); |
| 3625 } | 3636 } |
| 3626 } | 3637 } |
| (...skipping 4168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7795 | 7806 |
| 7796 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( | 7807 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( |
| 7797 HTMLCanvasElementOrOffscreenCanvas& result) const { | 7808 HTMLCanvasElementOrOffscreenCanvas& result) const { |
| 7798 if (canvas()) | 7809 if (canvas()) |
| 7799 result.setHTMLCanvasElement(canvas()); | 7810 result.setHTMLCanvasElement(canvas()); |
| 7800 else | 7811 else |
| 7801 result.setOffscreenCanvas(offscreenCanvas()); | 7812 result.setOffscreenCanvas(offscreenCanvas()); |
| 7802 } | 7813 } |
| 7803 | 7814 |
| 7804 } // namespace blink | 7815 } // namespace blink |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2626543002:
Handle ES3 Sampler types in getUniform in WebGL2RenderingContext (Closed)
