| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Google Inc. All rights reserved. | 3 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 PassRefPtr<WebGLUniformLocation> WebGLUniformLocation::create(WebGLProgram* prog
ram, GC3Dint location) | 33 PassRefPtr<WebGLUniformLocation> WebGLUniformLocation::create(WebGLProgram* prog
ram, GC3Dint location) |
| 34 { | 34 { |
| 35 return adoptRef(new WebGLUniformLocation(program, location)); | 35 return adoptRef(new WebGLUniformLocation(program, location)); |
| 36 } | 36 } |
| 37 | 37 |
| 38 WebGLUniformLocation::WebGLUniformLocation(WebGLProgram* program, GC3Dint locati
on) | 38 WebGLUniformLocation::WebGLUniformLocation(WebGLProgram* program, GC3Dint locati
on) |
| 39 : m_program(program) | 39 : m_program(program) |
| 40 , m_location(location) | 40 , m_location(location) |
| 41 { | 41 { |
| 42 ASSERT(m_program); | 42 ASSERT(m_program); |
| 43 ScriptWrappable::init(this); |
| 43 m_linkCount = m_program->getLinkCount(); | 44 m_linkCount = m_program->getLinkCount(); |
| 44 } | 45 } |
| 45 | 46 |
| 46 WebGLProgram* WebGLUniformLocation::program() const | 47 WebGLProgram* WebGLUniformLocation::program() const |
| 47 { | 48 { |
| 48 // If the program has been linked again, then this UniformLocation is no | 49 // If the program has been linked again, then this UniformLocation is no |
| 49 // longer valid. | 50 // longer valid. |
| 50 if (m_program->getLinkCount() != m_linkCount) | 51 if (m_program->getLinkCount() != m_linkCount) |
| 51 return 0; | 52 return 0; |
| 52 return m_program.get(); | 53 return m_program.get(); |
| 53 } | 54 } |
| 54 | 55 |
| 55 GC3Dint WebGLUniformLocation::location() const | 56 GC3Dint WebGLUniformLocation::location() const |
| 56 { | 57 { |
| 57 // If the program has been linked again, then this UniformLocation is no | 58 // If the program has been linked again, then this UniformLocation is no |
| 58 // longer valid. | 59 // longer valid. |
| 59 ASSERT(m_program->getLinkCount() == m_linkCount); | 60 ASSERT(m_program->getLinkCount() == m_linkCount); |
| 60 return m_location; | 61 return m_location; |
| 61 } | 62 } |
| 62 | 63 |
| 63 } | 64 } |
| OLD | NEW |